[PATCH v9 10/21] ARM64 / ACPI: If we chose to boot from acpi then disable FDT
From: Grant Likely <hidden>
Date: 2015-03-06 20:38:22
Also in:
linux-acpi, lkml
On Wed, 25 Feb 2015 16:39:50 +0800 , Hanjun Guo [off-list ref] wrote:
From: Graeme Gregory <redacted> 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@arm.com> CC: Will Deacon <redacted> Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> Tested-by: Yijing Wang <redacted> Tested-by: Mark Langsdorf <redacted> Tested-by: Jon Masters <redacted> Tested-by: Timur Tabi <redacted> Tested-by: Robert Richter <redacted> Acked-by: Robert Richter <redacted> Signed-off-by: Graeme Gregory <redacted> Signed-off-by: Hanjun Guo <redacted>
Acked-by: Grant Likely <redacted>
quoted hunk ↗ jump to hunk
--- 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