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

arndb · arndb · commit 800daa61a3f2 · 2016-07-07T14:56:34.000+02:00
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
diff --git a/arch/arm/mach-hisi/hisilicon.c b/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
diff --git a/arch/arm/mach-hisi/platsmp.c b/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;
 

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ static void __init hisi_common_smp_prepare_cpus(unsigned int max_cpus)`
`103`	`103`	`hisi_enable_scu_a9();`
`104`	`104`	`}`
`105`	`105`
`106`		`-void hix5hd2_set_scu_boot_addr(phys_addr_t start_addr, phys_addr_t jump_addr)`
	`106`	`+static void hix5hd2_set_scu_boot_addr(phys_addr_t start_addr, phys_addr_t jump_addr)`
`107`	`107`	`{`
`108`	`108`	`void __iomem *virt;`
`109`	`109`
`@@ -139,7 +139,7 @@ static const struct smp_operations hix5hd2_smp_ops __initconst = {`
`139`	`139`	`#define HIP01_BOOT_ADDRESS 0x80000000`
`140`	`140`	`#define REG_SC_CTRL 0x000`
`141`	`141`
`142`		`-void hip01_set_boot_addr(phys_addr_t start_addr, phys_addr_t jump_addr)`
	`142`	`+static void hip01_set_boot_addr(phys_addr_t start_addr, phys_addr_t jump_addr)`
`143`	`143`	`{`
`144`	`144`	`void __iomem *virt;`
`145`	`145`