From dd09f7e73c13f59bf7144667c35eb9e61eadf639 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 5 Mar 2015 20:19:36 -0500 Subject: ARM: PSCI: Rework the DT handler slightly The way the PSCI DT update happens currently means we pull in everywhere, including on ARMv8 and that in turn brings in for some non-PSCI related things that header needs to deal with. To fix this, we rework the hook slightly. A good portion of arch/arm/cpu/armv7/virt-dt.c is common looking and I hope that when PSCI is needed on ARMv8 we can re-use this by and large. So rename the current hook to psci_update_dt(), move the prototype to and add an #ifdef that will make re-use later easier. Reported-by: York Sun Cc: Marc Zyngier Cc: York Sun Cc: Ian Campbell Cc: Hans de Goede Cc: Albert ARIBAUD Signed-off-by: Tom Rini Acked-by: York Sun --- arch/arm/include/asm/armv7.h | 1 - arch/arm/include/asm/psci.h | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'arch/arm/include') diff --git a/arch/arm/include/asm/armv7.h b/arch/arm/include/asm/armv7.h index edb3b80015..c3cc5088ea 100644 --- a/arch/arm/include/asm/armv7.h +++ b/arch/arm/include/asm/armv7.h @@ -124,7 +124,6 @@ void v7_outer_cache_inval_range(u32 start, u32 end); #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT) int armv7_init_nonsec(void); -int armv7_update_dt(void *fdt); bool armv7_boot_nonsec(void); /* defined in assembly file */ diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index 704b4b0018..50a3ca45e1 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -32,4 +32,8 @@ #define ARM_PSCI_RET_INVAL (-2) #define ARM_PSCI_RET_DENIED (-3) +#ifndef __ASSEMBLY__ +int psci_update_dt(void *fdt); +#endif /* ! __ASSEMBLY__ */ + #endif /* __ARM_PSCI_H__ */ -- cgit