[PATCH v9 10/21] ARM64 / ACPI: If we chose to boot from acpi then disable FDT

[Hanjun Guo]

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=force has been passed, then do not unflat devicetree
effectively disabling further hardware probing from DT.

CC: Catalin Marinas <catalin.marinas at arm.com>
CC: Will Deacon <will.deacon at arm.com>
Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit at amd.com>
Tested-by: Yijing Wang <wangyijing at huawei.com>
Tested-by: Mark Langsdorf <mlangsdo at redhat.com>
Tested-by: Jon Masters <jcm at redhat.com>
Tested-by: Timur Tabi <timur at codeaurora.org>
Tested-by: Robert Richter <rrichter at cavium.com>
Acked-by: Robert Richter <rrichter at cavium.com>
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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 4f1a014..e8c7000 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -390,7 +390,8 @@ void __init setup_arch(char **cmdline_p)
 
 	early_ioremap_reset();
 
-	unflatten_device_tree();
+	if (acpi_disabled)
+		unflatten_device_tree();
 
 	psci_init();
 
-- 
1.9.1