Commit e094d445 authored by Sudeep Holla's avatar Sudeep Holla Committed by Will Deacon
Browse files

arm64: kernel: remove non-legit DT warnings when booting using ACPI

Since both CONFIG_ACPI and CONFIG_OF are enabled when booting using ACPI
tables on ARM64 platforms, we get few device tree warnings which are not
valid for ACPI boot. We can use of_have_populated_dt to check if the
device tree is populated or not before throwing out those errors.

This patch uses of_have_populated_dt to remove non legitimate device
tree warning when booting using ACPI tables.

Cc: Lorenzo Pieralisi <>
Acked-by: default avatarCatalin Marinas <>
Acked-by: default avatarMark Rutland <>
Signed-off-by: default avatarSudeep Holla <>
Signed-off-by: default avatarWill Deacon <>
parent 77ee306c
......@@ -423,8 +423,13 @@ void __init setup_arch(char **cmdline_p)
static int __init arm64_device_init(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
if (of_have_populated_dt()) {
of_platform_populate(NULL, of_default_bus_match_table,
} else if (acpi_disabled) {
pr_crit("Device tree not populated\n");
return 0;
......@@ -300,6 +300,6 @@ void __init init_cpu_topology(void)
* Discard anything that was parsed if we hit an error so we
* don't use partial information.
if (parse_dt_topology())
if (of_have_populated_dt() && parse_dt_topology())
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment