ACPI: Move AMBA bus scan handling into arm64 specific directory

Commit fcea0ccf4fd7 ("ACPI: bus: Consolidate all arm specific
initialisation into acpi_arm_init()") moved all of the ARM-specific
initialization into acpi_arm_init(). However, acpi_amba.c being outside
of drivers/acpi/arm64 got ignored and hence acpi_amba_init() was not
moved into acpi_arm_init().

Move the AMBA platform bus support into arm64 specific folder and make
acpi_amba_init() part of acpi_arm_init().

Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 3fc5a0d54f6efcf5425ac4b6b5a86b68570dd766..eaa09bf52f17609ffbb24fef7d7fccf12afe4024 100644 (file)
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -50,7 +50,6 @@ acpi-$(CONFIG_PCI)            += acpi_lpss.o
 acpi-y                         += acpi_apd.o
 acpi-y                         += acpi_platform.o
 acpi-y                         += acpi_pnp.o
-acpi-$(CONFIG_ARM_AMBA)        += acpi_amba.o
 acpi-y                         += power.o
 acpi-y                         += event.o
 acpi-y                         += evged.o

diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile
index f81fe24894b26eb229b20770dbf77a956d0e61ec..143debc1ba4a9d9dae6147c3c1dfc4408d05c5e9 100644 (file)
--- a/drivers/acpi/arm64/Makefile
+++ b/drivers/acpi/arm64/Makefile
@@ -3,4 +3,5 @@ obj-$(CONFIG_ACPI_AGDI)         += agdi.o
 obj-$(CONFIG_ACPI_IORT)        += iort.o
 obj-$(CONFIG_ACPI_GTDT)        += gtdt.o
 obj-$(CONFIG_ACPI_APMT)        += apmt.o
+obj-$(CONFIG_ARM_AMBA)         += amba.o
 obj-y                          += dma.o init.o

diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/arm64/amba.c
similarity index 99%
rename from drivers/acpi/acpi_amba.c
rename to drivers/acpi/arm64/amba.c
index f5b443ab01c2a83c394745a82754058f006a72da..b2a7631d7ac7538218d010982fd1a87cc8d829f7 100644 (file)
--- a/drivers/acpi/acpi_amba.c
+++ b/drivers/acpi/arm64/amba.c
@@ -17,7 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-#include "internal.h"
+#include "init.h"
 
 static const struct acpi_device_id amba_id_list[] = {
        {"ARMH0061", 0}, /* PL061 GPIO Device */

diff --git a/drivers/acpi/arm64/init.c b/drivers/acpi/arm64/init.c
index d3ce53dda12204d835255d0e138b7ab1a1249d8d..d0c8aed90fd16f9a7fe62b8c551c0cd091cb91ec 100644 (file)
--- a/drivers/acpi/arm64/init.c
+++ b/drivers/acpi/arm64/init.c
@@ -10,4 +10,6 @@ void __init acpi_arm_init(void)
                acpi_apmt_init();
        if (IS_ENABLED(CONFIG_ACPI_IORT))
                acpi_iort_init();
+       if (IS_ENABLED(CONFIG_ARM_AMBA))
+               acpi_amba_init();
 }

diff --git a/drivers/acpi/arm64/init.h b/drivers/acpi/arm64/init.h
index a1715a2a34e924cf75891f2a1f428b6a49a10ace..dcc277977194b63ecd6576abd0ceb98095c1b8ff 100644 (file)
--- a/drivers/acpi/arm64/init.h
+++ b/drivers/acpi/arm64/init.h
@@ -4,3 +4,4 @@
 void __init acpi_agdi_init(void);
 void __init acpi_apmt_init(void);
 void __init acpi_iort_init(void);
+void __init acpi_amba_init(void);

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index f4148dc50b9c233940c1054ab54a42a8d0727e5a..21ec31b7821699a8b23a5f9d093b30458601accd 100644 (file)
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -28,11 +28,6 @@ void acpi_processor_init(void);
 void acpi_platform_init(void);
 void acpi_pnp_init(void);
 void acpi_int340x_thermal_init(void);
-#ifdef CONFIG_ARM_AMBA
-void acpi_amba_init(void);
-#else
-static inline void acpi_amba_init(void) {}
-#endif
 int acpi_sysfs_init(void);
 void acpi_gpe_apply_masked_gpes(void);
 void acpi_container_init(void);

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 5b145f1aaa1b8bcd2b4e22a55ec5a91a04d1a738..902763430d5671fa8c50e69fdf472c97535198dd 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2615,7 +2615,6 @@ void __init acpi_scan_init(void)
        acpi_watchdog_init();
        acpi_pnp_init();
        acpi_int340x_thermal_init();
-       acpi_amba_init();
        acpi_init_lpit();
 
        acpi_scan_add_handler(&generic_device_handler);