ACPI: x86: Move x86 stuff into dedicated folder
cover ACPI: x86: Move x86 stuff into dedicated folder
Move x86 related modules (which are solely for x86) to the dedicated folder.
Note, there are more modules, but they are related to tables and potentially might be used for other architectures in the future. Hence touched only non-table related code.
Andy Shevchenko (4):
ACPI: x86: Introduce a Makefile
ACPI: x86: Move acpi_cmos_rtc to x86 folder
ACPI: x86: Move blacklist to x86 folder
ACPI: x86: Move LPSS to x86 folder
drivers/acpi/Makefile | 7 +------
drivers/acpi/x86/Makefile | 8 ++++++++
drivers/acpi/{ => x86}/blacklist.c | 2 +-
drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} | 2 +-
drivers/acpi/{acpi_lpss.c => x86/lpss.c} | 2 +-
5 files changed, 12 insertions(+), 9 deletions(-)
create mode 100644 drivers/acpi/x86/Makefile
rename drivers/acpi/{ => x86}/blacklist.c (99%)
rename drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} (98%)
rename drivers/acpi/{acpi_lpss.c => x86/lpss.c} (99%)Signature · 1 line
2.43.0.rc1.1.gbec44491f096
PATCH 1/4 ACPI: x86: Introduce a Makefile
There will be more modules coming here, so, introduce a separate Makefile and include it in parent one via obj-$(CONFIG_X86).
--- drivers/acpi/Makefile | 4 +--- drivers/acpi/x86/Makefile | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 drivers/acpi/x86/Makefile
drivers/acpi/Makefile +1 -3
@@ -56,9 +56,6 @@ acpi-y += evged.o acpi-y += sysfs.o acpi-y += property.o acpi-$(CONFIG_X86) += acpi_cmos_rtc.o -acpi-$(CONFIG_X86) += x86/apple.o -acpi-$(CONFIG_X86) += x86/utils.o -acpi-$(CONFIG_X86) += x86/s2idle.o acpi-$(CONFIG_DEBUG_FS) += debugfs.o acpi-y += acpi_lpat.o acpi-$(CONFIG_ACPI_FPDT) += acpi_fpdt.o
@@ -133,3 +130,4 @@ obj-$(CONFIG_ARM64) += arm64/ obj-$(CONFIG_ACPI_VIOT) += viot.o obj-$(CONFIG_RISCV) += riscv/ +obj-$(CONFIG_X86) += x86/
drivers/acpi/x86/Makefile new file +4 -0
@@ -0,0 +1,4 @@ +obj-$(CONFIG_ACPI) += acpi-x86.o +acpi-x86-y += apple.o +acpi-x86-y += s2idle.o +acpi-x86-y += utils.o
Signature · 1 line
2.43.0.rc1.1.gbec44491f096
PATCH 2/4 ACPI: x86: Move acpi_cmos_rtc to x86 folder
In reply to Andy Shevchenkoacpi_cmos_rtc is built solely for x86, move it to the respective folder.
---
drivers/acpi/Makefile | 1 -
drivers/acpi/x86/Makefile | 1 +
drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} (98%)drivers/acpi/Makefile +0 -1
@@ -55,7 +55,6 @@ acpi-y += event.o acpi-y += evged.o acpi-y += sysfs.o acpi-y += property.o -acpi-$(CONFIG_X86) += acpi_cmos_rtc.o acpi-$(CONFIG_DEBUG_FS) += debugfs.o acpi-y += acpi_lpat.o acpi-$(CONFIG_ACPI_FPDT) += acpi_fpdt.o
drivers/acpi/x86/Makefile +1 -0
@@ -1,4 +1,5 @@ obj-$(CONFIG_ACPI) += acpi-x86.o acpi-x86-y += apple.o +acpi-x86-y += cmos_rtc.o acpi-x86-y += s2idle.o acpi-x86-y += utils.o
drivers/acpi/x86/cmos_rtc.c renamed from drivers/acpi/acpi_cmos_rtc.c +1 -1
@@ -15,7 +15,7 @@#include <linux/module.h> #include <linux/mc146818rtc.h> -#include "internal.h" +#include "../internal.h" static const struct acpi_device_id acpi_cmos_rtc_ids[] = { {"PNP0B00" },
Signature · 1 line
2.43.0.rc1.1.gbec44491f096
PATCH 3/4 ACPI: x86: Move blacklist to x86 folder
In reply to Andy Shevchenkoblacklist is built solely for x86, move it to the respective folder.
---
drivers/acpi/Makefile | 1 -
drivers/acpi/x86/Makefile | 2 ++
drivers/acpi/{ => x86}/blacklist.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
rename drivers/acpi/{ => x86}/blacklist.c (99%)drivers/acpi/Makefile +0 -1
@@ -14,7 +14,6 @@ tables.o: $(src)/../../include/$(CONFIG_ACPI_CUSTOM_DSDT_FILE) ; endif obj-$(CONFIG_ACPI) += tables.o -obj-$(CONFIG_X86) += blacklist.o # # ACPI Core Subsystem (Interpreter)
drivers/acpi/x86/Makefile +2 -0
@@ -3,3 +3,5 @@ acpi-x86-y += apple.o acpi-x86-y += cmos_rtc.o acpi-x86-y += s2idle.o acpi-x86-y += utils.o + +obj-$(CONFIG_X86) += blacklist.o
drivers/acpi/x86/blacklist.c renamed from drivers/acpi/blacklist.c +1 -1
@@ -17,7 +17,7 @@#include <linux/acpi.h> #include <linux/dmi.h> -#include "internal.h" +#include "../internal.h" #ifdef CONFIG_DMI static const struct dmi_system_id acpi_rev_dmi_table[]__initconst ;
Signature · 1 line
2.43.0.rc1.1.gbec44491f096
PATCH 4/4 ACPI: x86: Move LPSS to x86 folder
In reply to Andy ShevchenkoLPSS is built solely for x86, move it to the respective folder.
---
drivers/acpi/Makefile | 1 -
drivers/acpi/x86/Makefile | 1 +
drivers/acpi/{acpi_lpss.c => x86/lpss.c} | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/acpi/{acpi_lpss.c => x86/lpss.c} (99%)drivers/acpi/Makefile +0 -1
@@ -45,7 +45,6 @@ acpi-y += ec.o acpi-$(CONFIG_ACPI_DOCK) += dock.o acpi-$(CONFIG_PCI) += pci_root.o pci_link.o pci_irq.o obj-$(CONFIG_ACPI_MCFG) += pci_mcfg.o -acpi-$(CONFIG_PCI) += acpi_lpss.o acpi-y += acpi_apd.o acpi-y += acpi_platform.o acpi-y += acpi_pnp.o
drivers/acpi/x86/Makefile +1 -0
@@ -1,6 +1,7 @@ obj-$(CONFIG_ACPI) += acpi-x86.o acpi-x86-y += apple.o acpi-x86-y += cmos_rtc.o +acpi-x86-$(CONFIG_PCI) += lpss.o acpi-x86-y += s2idle.o acpi-x86-y += utils.o
drivers/acpi/x86/lpss.c renamed from drivers/acpi/acpi_lpss.c +1 -1
@@ -25,7 +25,7 @@#include <linux/suspend.h> #include <linux/delay.h> -#include "internal.h" +#include "../internal.h" #ifdef CONFIG_X86_INTEL_LPSS
Signature · 1 line
2.43.0.rc1.1.gbec44491f096