From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>,
Linus Walleij <linusw@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Raag Jadav <raag.jadav@intel.com>,
Junjie Cao <junjie.cao@linux.dev>,
Runyu Xiao <runyu.xiao@seu.edu.cn>,
Maulik Shah <maulik.shah@oss.qualcomm.com>,
Peng Fan <peng.fan@nxp.com>,
linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org
Cc: Bartosz Golaszewski <brgl@kernel.org>,
Andy Shevchenko <andy@kernel.org>,
Peter Tyser <ptyser@xes-inc.com>,
Kuppuswamy Sathyanarayanan
<sathyanarayanan.kuppuswamy@linux.intel.com>,
Alan Borzeszkowski <alan.borzeszkowski@linux.intel.com>,
William Breathitt Gray <wbg@kernel.org>,
Israel Cepeda <israel.a.cepeda.lopez@intel.com>,
Hans de Goede <hansg@kernel.org>,
Lixu Zhang <lixu.zhang@intel.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>
Subject: [PATCH v1 2/5] gpio: Move Intel PMIC GPIO drivers to the dedicated subfolder
Date: Fri, 25 Sep 2026 17:57:04 +0200 [thread overview]
Message-ID: <20260925160913.1648565-3-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20260925160913.1648565-1-andriy.shevchenko@linux.intel.com>
For better maintenance and development experience, move
Intel PMIC GPIO drivers to the dedicated subfolder.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
MAINTAINERS | 4 +--
drivers/gpio/Kconfig | 26 ----------------
drivers/gpio/Makefile | 2 --
drivers/gpio/intel/Kconfig | 2 ++
drivers/gpio/intel/Makefile | 2 ++
drivers/gpio/intel/pmic/Kconfig | 30 +++++++++++++++++++
drivers/gpio/intel/pmic/Makefile | 5 ++++
.../gpio/{ => intel/pmic}/gpio-crystalcove.c | 0
drivers/gpio/{ => intel/pmic}/gpio-wcove.c | 0
9 files changed, 41 insertions(+), 30 deletions(-)
create mode 100644 drivers/gpio/intel/pmic/Kconfig
create mode 100644 drivers/gpio/intel/pmic/Makefile
rename drivers/gpio/{ => intel/pmic}/gpio-crystalcove.c (100%)
rename drivers/gpio/{ => intel/pmic}/gpio-wcove.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 51e27580be9f..1943aa049c87 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13394,7 +13394,7 @@ INTEL PMIC GPIO DRIVERS
M: Andy Shevchenko <andy@kernel.org>
S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
-F: drivers/gpio/gpio-*cove.c
+F: drivers/gpio/intel/pmic/
INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
M: Andy Shevchenko <andy@kernel.org>
@@ -29374,7 +29374,7 @@ WHISKEYCOVE PMIC GPIO DRIVER
M: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
L: linux-gpio@vger.kernel.org
S: Maintained
-F: drivers/gpio/gpio-wcove.c
+F: drivers/gpio/intel/pmic/gpio-wcove.c
WHWAVE RTC DRIVER
M: Dianlong Li <long17.cool@163.com>
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index e04f6d761153..a80f4303bb0e 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -1407,19 +1407,6 @@ config GPIO_CROS_EC
This driver can also be built as a module. If so, the module
will be called gpio-cros-ec.
-config GPIO_CRYSTAL_COVE
- tristate "GPIO support for Crystal Cove PMIC"
- depends on (X86 || COMPILE_TEST) && INTEL_SOC_PMIC
- select GPIOLIB_IRQCHIP
- help
- Support for GPIO pins on Crystal Cove PMIC.
-
- Say Yes if you have a Intel SoC-based tablet with Crystal Cove PMIC
- inside.
-
- This driver can also be built as a module. If so, the module will be
- called gpio-crystalcove.
-
config GPIO_CS5535
tristate "AMD CS5535/CS5536 GPIO support"
depends on X86 || MIPS || COMPILE_TEST
@@ -1759,19 +1746,6 @@ config GPIO_TWL6040
Say yes here to access the GPO signals of twl6040
audio chip from Texas Instruments.
-config GPIO_WHISKEY_COVE
- tristate "GPIO support for Whiskey Cove PMIC"
- depends on (X86 || COMPILE_TEST) && INTEL_SOC_PMIC_BXTWC
- select GPIOLIB_IRQCHIP
- help
- Support for GPIO pins on Whiskey Cove PMIC.
-
- Say Yes if you have an Intel SoC-based tablet with Whiskey Cove PMIC
- inside.
-
- This driver can also be built as a module. If so, the module will be
- called gpio-wcove.
-
config GPIO_WM831X
tristate "WM831x GPIOs"
depends on MFD_WM831X
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index a4f1ec80b794..747df558ba92 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -57,7 +57,6 @@ obj-$(CONFIG_GPIO_CGBC) += gpio-cgbc.o
obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o
obj-$(CONFIG_GPIO_SNPS_CREG) += gpio-creg-snps.o
obj-$(CONFIG_GPIO_CROS_EC) += gpio-cros-ec.o
-obj-$(CONFIG_GPIO_CRYSTAL_COVE) += gpio-crystalcove.o
obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o
obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o
obj-$(CONFIG_GPIO_DA9055) += gpio-da9055.o
@@ -209,7 +208,6 @@ obj-$(CONFIG_GPIO_VISCONTI) += gpio-visconti.o
obj-$(CONFIG_GPIO_VX855) += gpio-vx855.o
obj-$(CONFIG_GPIO_WAVESHARE_DSI_TOUCH) += gpio-waveshare-dsi.o
obj-$(CONFIG_GPIO_WCD934X) += gpio-wcd934x.o
-obj-$(CONFIG_GPIO_WHISKEY_COVE) += gpio-wcove.o
obj-$(CONFIG_GPIO_WINBOND) += gpio-winbond.o
obj-$(CONFIG_GPIO_WM831X) += gpio-wm831x.o
obj-$(CONFIG_GPIO_WM8350) += gpio-wm8350.o
diff --git a/drivers/gpio/intel/Kconfig b/drivers/gpio/intel/Kconfig
index 4d1a37a6c5e8..64fd3aa84ac2 100644
--- a/drivers/gpio/intel/Kconfig
+++ b/drivers/gpio/intel/Kconfig
@@ -35,3 +35,5 @@ config GPIO_MERRIFIELD
Say Y here to support Intel Merrifield GPIO.
endif
+
+source "drivers/gpio/intel/pmic/Kconfig"
diff --git a/drivers/gpio/intel/Makefile b/drivers/gpio/intel/Makefile
index c8c8aea69c29..acff63df179a 100644
--- a/drivers/gpio/intel/Makefile
+++ b/drivers/gpio/intel/Makefile
@@ -4,3 +4,5 @@
obj-$(CONFIG_GPIO_TANGIER) += gpio-tangier.o
obj-$(CONFIG_GPIO_ELKHARTLAKE) += gpio-elkhartlake.o
obj-$(CONFIG_GPIO_MERRIFIELD) += gpio-merrifield.o
+
+obj-y += pmic/
diff --git a/drivers/gpio/intel/pmic/Kconfig b/drivers/gpio/intel/pmic/Kconfig
new file mode 100644
index 000000000000..fe21314697a3
--- /dev/null
+++ b/drivers/gpio/intel/pmic/Kconfig
@@ -0,0 +1,30 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel PMIC GPIO drivers
+#
+
+config GPIO_CRYSTAL_COVE
+ tristate "GPIO support for Crystal Cove PMIC"
+ depends on (X86 || COMPILE_TEST) && INTEL_SOC_PMIC
+ select GPIOLIB_IRQCHIP
+ help
+ Support for GPIO pins on Crystal Cove PMIC.
+
+ Say Yes if you have a Intel SoC-based tablet with Crystal Cove PMIC
+ inside.
+
+ This driver can also be built as a module. If so, the module will be
+ called gpio-crystalcove.
+
+config GPIO_WHISKEY_COVE
+ tristate "GPIO support for Whiskey Cove PMIC"
+ depends on (X86 || COMPILE_TEST) && INTEL_SOC_PMIC_BXTWC
+ select GPIOLIB_IRQCHIP
+ help
+ Support for GPIO pins on Whiskey Cove PMIC.
+
+ Say Yes if you have an Intel SoC-based tablet with Whiskey Cove PMIC
+ inside.
+
+ This driver can also be built as a module. If so, the module will be
+ called gpio-wcove.
diff --git a/drivers/gpio/intel/pmic/Makefile b/drivers/gpio/intel/pmic/Makefile
new file mode 100644
index 000000000000..2a95d7735153
--- /dev/null
+++ b/drivers/gpio/intel/pmic/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+# Intel PMIC GPIO drivers
+
+obj-$(CONFIG_GPIO_CRYSTAL_COVE) += gpio-crystalcove.o
+obj-$(CONFIG_GPIO_WHISKEY_COVE) += gpio-wcove.o
diff --git a/drivers/gpio/gpio-crystalcove.c b/drivers/gpio/intel/pmic/gpio-crystalcove.c
similarity index 100%
rename from drivers/gpio/gpio-crystalcove.c
rename to drivers/gpio/intel/pmic/gpio-crystalcove.c
diff --git a/drivers/gpio/gpio-wcove.c b/drivers/gpio/intel/pmic/gpio-wcove.c
similarity index 100%
rename from drivers/gpio/gpio-wcove.c
rename to drivers/gpio/intel/pmic/gpio-wcove.c
--
2.50.1
next prev parent reply other threads:[~2026-09-25 16:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-25 15:57 [PATCH v1 0/5] gpio: Move most of the Intel GPIO to the dedicated folder Andy Shevchenko
2026-09-25 15:57 ` [PATCH v1 1/5] gpio: Move Intel GPIO drivers to the dedicated subfolder Andy Shevchenko
2026-09-26 5:42 ` Raag Jadav
2026-09-26 16:55 ` Andy Shevchenko
2026-09-25 15:57 ` Andy Shevchenko [this message]
2026-09-28 17:10 ` [PATCH v1 2/5] gpio: Move Intel PMIC " Bartosz Golaszewski
2026-09-28 18:07 ` Andy Shevchenko
2026-09-25 15:57 ` [PATCH v1 3/5] gpio: Move Intel PCH type of GPIO drivers to the intel subfolder Andy Shevchenko
2026-10-04 5:48 ` Junjie Cao
2026-10-04 8:28 ` Andy Shevchenko
2026-09-25 15:57 ` [PATCH v1 4/5] gpio: Move Intel Sodaville GPIO driver " Andy Shevchenko
2026-09-25 15:57 ` [PATCH v1 5/5] gpio: Move Intel vGPIO " Andy Shevchenko
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=20260925160913.1648565-3-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=alan.borzeszkowski@linux.intel.com \
--cc=andy@kernel.org \
--cc=bartosz.golaszewski@oss.qualcomm.com \
--cc=brgl@kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=hansg@kernel.org \
--cc=israel.a.cepeda.lopez@intel.com \
--cc=junjie.cao@linux.dev \
--cc=linusw@kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lixu.zhang@intel.com \
--cc=maulik.shah@oss.qualcomm.com \
--cc=peng.fan@nxp.com \
--cc=ptyser@xes-inc.com \
--cc=raag.jadav@intel.com \
--cc=runyu.xiao@seu.edu.cn \
--cc=sakari.ailus@linux.intel.com \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=wbg@kernel.org \
/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.