]> git.ipfire.org Git - people/ms/u-boot.git/commit
ARM: PSCI: Rework the DT handler slightly
authorTom Rini <trini@konsulko.com>
Fri, 6 Mar 2015 01:19:36 +0000 (20:19 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 9 Mar 2015 15:13:29 +0000 (11:13 -0400)
commitdd09f7e73c13f59bf7144667c35eb9e61eadf639
treeb36a7a5f18d7a63293b00478759808e50ecdef11
parent52a7c98a1772859131ca2018d0ab591a1e0e95c9
ARM: PSCI: Rework the DT handler slightly

The way the PSCI DT update happens currently means we pull in
<asm/armv7.h> everywhere, including on ARMv8 and that in turn brings in
<asm/io.h> 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 <asm/psci.h> and
add an #ifdef that will make re-use later easier.

Reported-by: York Sun <yorksun@freescale.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: York Sun <yorksun@freescale.com>
Cc: Ian Campbell <ijc@hellion.org.uk>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: York Sun <yorksun@freescale.com>
arch/arm/cpu/armv7/virt-dt.c
arch/arm/include/asm/armv7.h
arch/arm/include/asm/psci.h
arch/arm/lib/bootm-fdt.c