]> git.kernelconcepts.de Git - karo-tx-uboot.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)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 1 Sep 2015 12:28:31 +0000 (14:28 +0200)
commit0387848b1b2a726581536234c770fbabe7290354
tree90d055da7767bbad4c0ff1d4e1a8b50a2139760c
parent39879b0311ee23432a35ff92a1a42def6e0cd1c3
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