[Linaro-acpi] [PATCH] arm64: if we chose to boot from acpi then disable FDT

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

Signed-off-by: Graeme Gregory graeme.gregory@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 09f34ca..eac789d 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -242,7 +242,8 @@ void __init setup_arch(char **cmdline_p) paging_init(); request_standard_resources();

- unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree();

psci_init();