Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 800daa61 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents 04b6d0a3 abee8fbf

arch/arm/mach-hisi/hisilicon.c

+0 −28
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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;