From: Graeme Gregory <graeme.gregory@xxxxxxxxxx> 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@xxxxxxx> CC: Will Deacon <will.deacon@xxxxxxx> Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@xxxxxxx> Tested-by: Yijing Wang <wangyijing@xxxxxxxxxx> Tested-by: Mark Langsdorf <mlangsdo@xxxxxxxxxx> Tested-by: Jon Masters <jcm@xxxxxxxxxx> Tested-by: Timur Tabi <timur@xxxxxxxxxxxxxx> Tested-by: Robert Richter <rrichter@xxxxxxxxxx> Acked-by: Robert Richter <rrichter@xxxxxxxxxx> Acked-by: Olof Johansson <olof@xxxxxxxxx> Acked-by: Grant Likely <grant.likely@xxxxxxxxxx> Signed-off-by: Graeme Gregory <graeme.gregory@xxxxxxxxxx> Signed-off-by: Hanjun Guo <hanjun.guo@xxxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
