From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Zhang Rui <rui.zhang@intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org
Cc: "Rafael J. Wysocki" <rafael@kernel.org>, Len Brown <lenb@kernel.org>
Subject: [PATCH v2 4/4] ACPI: x86: Move LPSS to x86 folder
Date: Thu, 4 Apr 2024 21:23:42 +0300 [thread overview]
Message-ID: <20240404183448.3310449-5-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20240404183448.3310449-1-andriy.shevchenko@linux.intel.com>
LPSS is built solely for x86, move it to the respective folder.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/acpi/Makefile | 1 -
drivers/acpi/internal.h | 3 ++-
drivers/acpi/x86/Makefile | 1 +
drivers/acpi/{acpi_lpss.c => x86/lpss.c} | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
rename drivers/acpi/{acpi_lpss.c => x86/lpss.c} (99%)
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 6f4187a34f41..39ea5cfa8326 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -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
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index ca72a0dc5715..60c483836756 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -69,7 +69,8 @@ void acpi_debugfs_init(void);
#else
static inline void acpi_debugfs_init(void) { return; }
#endif
-#ifdef CONFIG_PCI
+
+#if defined(CONFIG_X86) && defined(CONFIG_PCI)
void acpi_lpss_init(void);
#else
static inline void acpi_lpss_init(void) {}
diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile
index 1f3c5fa84f9e..63c99509ed9d 100644
--- a/drivers/acpi/x86/Makefile
+++ b/drivers/acpi/x86/Makefile
@@ -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
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/x86/lpss.c
similarity index 99%
rename from drivers/acpi/acpi_lpss.c
rename to drivers/acpi/x86/lpss.c
index a3d2d94be5c0..148e29c2c526 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/x86/lpss.c
@@ -25,7 +25,7 @@
#include <linux/suspend.h>
#include <linux/delay.h>
-#include "internal.h"
+#include "../internal.h"
#ifdef CONFIG_X86_INTEL_LPSS
--
2.43.0.rc1.1.gbec44491f096
next prev parent reply other threads:[~2024-04-04 18:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-04 18:23 [PATCH v2 0/4] ACPI: x86: Move x86 stuff into dedicated folder Andy Shevchenko
2024-04-04 18:23 ` [PATCH v2 1/4] ACPI: x86: Introduce a Makefile Andy Shevchenko
2024-04-04 18:23 ` [PATCH v2 2/4] ACPI: x86: Move acpi_cmos_rtc to x86 folder Andy Shevchenko
2024-04-04 18:23 ` [PATCH v2 3/4] ACPI: x86: Move blacklist " Andy Shevchenko
2024-04-05 14:44 ` Kuppuswamy Sathyanarayanan
2024-04-05 15:19 ` Andy Shevchenko
2024-04-05 15:29 ` Kuppuswamy Sathyanarayanan
2024-04-04 18:23 ` Andy Shevchenko [this message]
2024-04-05 14:45 ` [PATCH v2 0/4] ACPI: x86: Move x86 stuff into dedicated folder Kuppuswamy Sathyanarayanan
2024-04-05 15:20 ` Andy Shevchenko
2024-04-08 18:33 [PATCH v2 4/4] ACPI: x86: Move LPSS to x86 folder kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240404183448.3310449-5-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=rafael@kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.