MIPS: Loongson-3: Move chipset ACPI code from drivers to arch

SB700/SB710/SB800 chipset ACPI code is mostly Loongson-3 specific
routines rather than a "platform driver".

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Cc: John Crispin <john@phrozen.org>
Cc: Steven J. Hill <sjhill@realitydiluted.com>
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11273/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/loongson64/loongson-3/Makefile b/arch/mips/loongson64/loongson-3/Makefile
index 622fead5ebc9b1fa22003066ab9138518b2a9d1b..44bc1482158bf2b335b3784bafb87f5cda7ba6a1 100644 (file)
--- a/arch/mips/loongson64/loongson-3/Makefile
+++ b/arch/mips/loongson64/loongson-3/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for Loongson-3 family machines
 #
-obj-y                  += irq.o cop2-ex.o platform.o
+obj-y                  += irq.o cop2-ex.o platform.o acpi_init.o
 
 obj-$(CONFIG_SMP)      += smp.o
 

diff --git a/drivers/platform/mips/acpi_init.c b/arch/mips/loongson64/loongson-3/acpi_init.c
similarity index 100%
rename from drivers/platform/mips/acpi_init.c
rename to arch/mips/loongson64/loongson-3/acpi_init.c

diff --git a/drivers/platform/mips/Kconfig b/drivers/platform/mips/Kconfig
index 125e569017be6348dd49c522791f0277067f8f1d..b3ae30a4c67b6fc04caa68b52fc307bbfb45695a 100644 (file)
--- a/drivers/platform/mips/Kconfig
+++ b/drivers/platform/mips/Kconfig
@@ -15,10 +15,6 @@ menuconfig MIPS_PLATFORM_DEVICES
 
 if MIPS_PLATFORM_DEVICES
 
-config MIPS_ACPI
-       bool
-       default y if LOONGSON_MACH3X
-
 config CPU_HWMON
        tristate "Loongson CPU HWMon Driver"
        depends on LOONGSON_MACH3X

diff --git a/drivers/platform/mips/Makefile b/drivers/platform/mips/Makefile
index 43412849b195deaf5e40f69d642c0fbfbd8e126f..8dfd03924c3701e5d36a164740a6da57fdc9e3cf 100644 (file)
--- a/drivers/platform/mips/Makefile
+++ b/drivers/platform/mips/Makefile
@@ -1,2 +1 @@
-obj-$(CONFIG_MIPS_ACPI) += acpi_init.o
 obj-$(CONFIG_CPU_HWMON) += cpu_hwmon.o