[PATCH v2 16/18] ARM64 / ACPI: If we chose to boot from acpi then disable FDT

Hanjun Guo hanjun.guo at linaro.org
Mon Aug 4 08:28:23 PDT 2014

From: Graeme Gregory <graeme.gregory at linaro.org>

If the early boot methods of acpi are happy that we have valid ACPI
tables and acpi=on has been passed. Then do not unflat devicetree
effectively disabling further hardware probing from DT.

Signed-off-by: Graeme Gregory <graeme.gregory at linaro.org>
Signed-off-by: Hanjun Guo <hanjun.guo at linaro.org>
 arch/arm64/kernel/setup.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 056e2e1..0742e8c 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -399,8 +399,8 @@ void __init setup_arch(char **cmdline_p)
 	cpu_logical_map(0) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK;
-	unflatten_device_tree();
+	if (acpi_disabled)
+		unflatten_device_tree();

More information about the linux-arm-kernel mailing list