diff options
| -rw-r--r-- | arch/arm64/include/asm/io.h | 1 | ||||
| -rw-r--r-- | arch/arm64/kernel/setup.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h index 0d16c3cc4480..ce392f12fcc7 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -241,7 +241,6 @@ extern void __init early_ioremap_reset(void); #define ioremap_nocache(addr, size) __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE)) #define ioremap_wc(addr, size) __ioremap((addr), (size), __pgprot(PROT_NORMAL_NC)) #define ioremap_cached(addr, size) __ioremap((addr), (size), __pgprot(PROT_NORMAL)) -#define ioremap_cache(addr, size) __ioremap((addr), (size), __pgprot(PROT_NORMAL)) #define iounmap __iounmap #define PROT_SECT_DEFAULT (PMD_TYPE_SECT | PMD_SECT_AF) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 9403fe4eadbd..739a8ba5bece 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -175,6 +175,10 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys) /* Retrieve various information from the /chosen node */ of_scan_flat_dt(early_init_dt_scan_chosen, boot_command_line); +#ifdef CONFIG_ACPI + /* Retrieve ACPI pointers from /chosen node */ + of_scan_flat_dt(early_init_dt_scan_acpi, &acpi_arm_rsdp_info); +#endif /* Initialize {size,address}-cells info */ of_scan_flat_dt(early_init_dt_scan_root, NULL); /* Setup memory, calling early_init_dt_add_memory_arch */ |