ARM: mach-hisi: Hisilicon SoC updates for 4.8

- Consolidate the hisilicon armv7 SoCs machine entries
 - Avoid the compiling warning by making unexported symbols static
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXfj+gAAoJEAvIV27ZiWZc11EP/0kPj0ppDbsRKzNYxi9c4SG5
 lRKhpRhmZ8ZpGg/LZH4WttN1aQ5ul+AM0OD6naYnbArZrgnYsMuxW1jz6LBjhxaC
 ZuUWgGIPnaIxUQjKLrLuWGYM1xTw3iBYLO0hW3OIY2y/092K1w6+pQTkY4ONPNiT
 79V2I/ktq5GKRPBSxT02MBvsICN0PXlpgkOEjSuhSOrAA6BjyulwcQql2JHZ1XCK
 KtLiUxfX+xSSoPzUAzJnXhVZ3ez+VQUoL6ZHSdIJ7FiI95xBI+uBAAE5bsy2GqHe
 9HBwTN6F5BNPIwP85nnqTqYx/5Le6LX3lm7KcqxsQb5fsnYWCoc3eChkvRMDptNC
 pYC/SxtXFRuDKYBwcJQAFTa1Y5BRCvP49R5kJ6McZ8toazef4404LtppwRcIzTgN
 k57k5114kVG/wKPChslfJ3GB4ab91orJbHkwqpUOhrn+EttQcr0EadxHv/skElkh
 8E2uX5uNTC/heJqKQCC2hEwlFhDO6/oAth147aAHJzb7Q41NdK2EgyNu/Tf47UIr
 2UZi5Ex23u3qRB/jNaa9LydDXxuy7Dj5WFWy7SxRmjNdLdIcS1OLJZnG0VY1ISye
 aDjCPTjNlvQXNSIDyopafNVgsWVx5hsEFaKJ7Q/xWeJplZhDeRl3B1w6Qky3LS/w
 z719l6AyJYyQHLyYNtZ5
 =W1iC
 -----END PGP SIGNATURE-----

Merge tag 'hisi-armv7-soc-for-4.8-v3' of git://github.com/hisilicon/linux-hisi into next/soc

Merge "ARM: mach-hisi: Hisilicon SoC updates for 4.8" from Wei Xu:

- Consolidate the hisilicon armv7 SoCs machine entries
- Avoid the compiling warning by making unexported symbols static

* tag 'hisi-armv7-soc-for-4.8-v3' of git://github.com/hisilicon/linux-hisi:
  ARM: hisi: consolidate the hisilicon machine entries
  ARM: hisi: make unexported symbols static

arch/arm/mach-hisi/hisilicon.c

@@ -53,31 +53,3 @@ DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)")
 	.map_io		= hi3620_map_io,
 	.dt_compat	= hi3xxx_compat,
 MACHINE_END
-
-static const char *const hix5hd2_compat[] __initconst = {
-	"hisilicon,hix5hd2",
-	NULL,
-};
-
-DT_MACHINE_START(HIX5HD2_DT, "Hisilicon HIX5HD2 (Flattened Device Tree)")
-	.dt_compat	= hix5hd2_compat,
-MACHINE_END
-
-static const char *const hip04_compat[] __initconst = {
-	"hisilicon,hip04-d01",
-	NULL,
-};
-
-DT_MACHINE_START(HIP04, "Hisilicon HiP04 (Flattened Device Tree)")
-	.dt_compat	= hip04_compat,
-MACHINE_END
-
-static const char *const hip01_compat[] __initconst = {
-	"hisilicon,hip01",
-	"hisilicon,hip01-ca9x2",
-	NULL,
-};
-
-DT_MACHINE_START(HIP01, "Hisilicon HIP01 (Flattened Device Tree)")
-	.dt_compat      = hip01_compat,
-MACHINE_END

arch/arm/mach-hisi/platsmp.c

@@ -103,7 +103,7 @@ static void __init hisi_common_smp_prepare_cpus(unsigned int max_cpus)
 	hisi_enable_scu_a9();
 }
 
-void hix5hd2_set_scu_boot_addr(phys_addr_t start_addr, phys_addr_t jump_addr)
+static void hix5hd2_set_scu_boot_addr(phys_addr_t start_addr, phys_addr_t jump_addr)
 {
 	void __iomem *virt;
 
@@ -139,7 +139,7 @@ static const struct smp_operations hix5hd2_smp_ops __initconst = {
 #define HIP01_BOOT_ADDRESS     0x80000000
 #define REG_SC_CTRL            0x000
 
-void hip01_set_boot_addr(phys_addr_t start_addr, phys_addr_t jump_addr)
+static void hip01_set_boot_addr(phys_addr_t start_addr, phys_addr_t jump_addr)
 {
 	void __iomem *virt;