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

Commit 29d189e1 authored by Wang Long's avatar Wang Long Committed by Olof Johansson
Browse files

ARM: hisi: rename secondary_startup function 



As hix5hd2 and hip01 has the same secondary_startup
so rename hix5hd2_secondary_startup to
to hisi_secondary_startup.

the hip01 will use hisi_secondary_startup for the
secondary core boot.

Signed-off-by: default avatarWang Long <long.wanglong@huawei.com>
Signed-off-by: default avatarWei Xu <xuwei5@hisilicon.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent e243f943

arch/arm/mach-hisi/core.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ extern void hi3xxx_cpu_die(unsigned int cpu); 
extern int hi3xxx_cpu_kill(unsigned int cpu);

extern void hi3xxx_set_cpu(int cpu, bool enable);



extern void hix5hd2_secondary_startup(void);

extern void hisi_secondary_startup(void);

extern struct smp_operations hix5hd2_smp_ops;

extern void hix5hd2_set_cpu(int cpu, bool enable);

extern void hix5hd2_cpu_die(unsigned int cpu);

arch/arm/mach-hisi/headsmp.S

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,6 @@ 


	__CPUINIT



ENTRY(hix5hd2_secondary_startup)

ENTRY(hisi_secondary_startup)

	bl	v7_invalidate_l1

	b	secondary_startup

arch/arm/mach-hisi/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int hix5hd2_boot_secondary(unsigned int cpu, struct task_struct *idle) 
{

	phys_addr_t jumpaddr;



	jumpaddr = virt_to_phys(hix5hd2_secondary_startup);

	jumpaddr = virt_to_phys(hisi_secondary_startup);

	hix5hd2_set_scu_boot_addr(HIX5HD2_BOOT_ADDRESS, jumpaddr);

	hix5hd2_set_cpu(cpu, true);

	arch_send_wakeup_ipi_mask(cpumask_of(cpu));