Headers exposing symbols specific to individual GPIO drivers should all
live under linux/gpio/ for consistency. scx200_gpio.h is currently a
top-level header directly under linux/. Move it and update all users.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
---
With Acks from relevant maintainers, I can take it through the GPIO
tree.
---
 MAINTAINERS                                    | 2 +-
 arch/x86/platform/scx200/scx200_32.c           | 2 +-
 drivers/char/scx200_gpio.c                     | 2 +-
 drivers/leds/leds-net48xx.c                    | 2 +-
 drivers/leds/leds-wrap.c                       | 2 +-
 include/linux/{scx200_gpio.h => gpio/scx200.h} | 0
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 8d768ddae1173a1a3470b9306a8c791d0efe6127..a733f362446dac2bfce628bf198cfad1b1a170bf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -23885,7 +23885,7 @@ SCx200 GPIO DRIVER
 M:	Jim Cromie <jim.cromie@gmail.com>
 S:	Maintained
 F:	drivers/char/scx200_gpio.c
-F:	include/linux/scx200_gpio.h
+F:	include/linux/gpio/scx200.h
 
 SCx200 HRT CLOCKSOURCE DRIVER
 M:	Jim Cromie <jim.cromie@gmail.com>
diff --git a/arch/x86/platform/scx200/scx200_32.c b/arch/x86/platform/scx200/scx200_32.c
index 80662b72035d24b209b17272a816066422d44693..c4fe707065a412ccd7fa9dfd0c9c03b690cf9d33 100644
--- a/arch/x86/platform/scx200/scx200_32.c
+++ b/arch/x86/platform/scx200/scx200_32.c
@@ -12,8 +12,8 @@
 #include <linux/mutex.h>
 #include <linux/pci.h>
 
+#include <linux/gpio/scx200.h>
 #include <linux/scx200.h>
-#include <linux/scx200_gpio.h>
 
 /* Verify that the configuration block really is there */
 #define scx200_cb_probe(base) (inw((base) + SCx200_CBA) == (base))
diff --git a/drivers/char/scx200_gpio.c b/drivers/char/scx200_gpio.c
index 700e6affea6f78734f58f7b392e858272f0edb72..933eed306c5f9bdd61876dfc67e19a3f1b29cb84 100644
--- a/drivers/char/scx200_gpio.c
+++ b/drivers/char/scx200_gpio.c
@@ -19,7 +19,7 @@
 #include <linux/types.h>
 #include <linux/cdev.h>
 
-#include <linux/scx200_gpio.h>
+#include <linux/gpio/scx200.h>
 #include <linux/nsc_gpio.h>
 
 #define DRVNAME "scx200_gpio"
diff --git a/drivers/leds/leds-net48xx.c b/drivers/leds/leds-net48xx.c
index a93468c13772f878e1b0ca76fa37b53dc1bf70cf..aec49cd56f532896868d398f005ca2796e91049f 100644
--- a/drivers/leds/leds-net48xx.c
+++ b/drivers/leds/leds-net48xx.c
@@ -14,7 +14,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/nsc_gpio.h>
-#include <linux/scx200_gpio.h>
+#include <linux/gpio/scx200.h>
 #include <linux/module.h>
 
 #define DRVNAME "net48xx-led"
diff --git a/drivers/leds/leds-wrap.c b/drivers/leds/leds-wrap.c
index 794697e160685cbfd8ccb381f9e814880f62965d..ea133de2537b4df9f3ab8c5ce510c5894db47baa 100644
--- a/drivers/leds/leds-wrap.c
+++ b/drivers/leds/leds-wrap.c
@@ -13,7 +13,7 @@
 #include <linux/leds.h>
 #include <linux/err.h>
 #include <linux/io.h>
-#include <linux/scx200_gpio.h>
+#include <linux/gpio/scx200.h>
 #include <linux/module.h>
 
 #define DRVNAME "wrap-led"
diff --git a/include/linux/scx200_gpio.h b/include/linux/gpio/scx200.h
similarity index 100%
rename from include/linux/scx200_gpio.h
rename to include/linux/gpio/scx200.h

---
base-commit: 8e5a478b6d6a5bb0a3d52147862b15e4d826af19
change-id: 20260318-gpio-scx200-header-1d97817143a6

Best regards,
-- 
Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>

On Wed, Mar 18, 2026, at 14:48, Bartosz Golaszewski wrote:
> Headers exposing symbols specific to individual GPIO drivers should all
> live under linux/gpio/ for consistency. scx200_gpio.h is currently a
> top-level header directly under linux/. Move it and update all users.
>
> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> ---
> With Acks from relevant maintainers, I can take it through the GPIO
> tree.

No objections to the change, but I'd point out that while this is a
driver for gpio registers, it's not a gpiolib driver but rather a
custom chardev with ioctl interface.

Since the chip was never as popular as the separate geode/cs553x
ones, I wonder if there are any users left, maybe Jim has an idea.

If there are users, they might be able to use drivers/gpio/gpio-cs5535.c
instead, but I have not checked if the two are compatible.

     Arnd

On Wed, Mar 18, 2026 at 3:25 PM Arnd Bergmann <arnd@arndb.de> wrote:
>
> On Wed, Mar 18, 2026, at 14:48, Bartosz Golaszewski wrote:
> > Headers exposing symbols specific to individual GPIO drivers should all
> > live under linux/gpio/ for consistency. scx200_gpio.h is currently a
> > top-level header directly under linux/. Move it and update all users.
> >
> > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> > ---
> > With Acks from relevant maintainers, I can take it through the GPIO
> > tree.
>
> No objections to the change, but I'd point out that while this is a
> driver for gpio registers, it's not a gpiolib driver but rather a
> custom chardev with ioctl interface.
>

Yeah I wasn't sure if we consider linux/gpio/ as a GPIOLIB directory
or just GPIO in general. I figured it may as well be the latter.

Bart

> Since the chip was never as popular as the separate geode/cs553x
> ones, I wonder if there are any users left, maybe Jim has an idea.
>
> If there are users, they might be able to use drivers/gpio/gpio-cs5535.c
> instead, but I have not checked if the two are compatible.
>

On Thu, Mar 19, 2026 at 3:13 AM Bartosz Golaszewski <brgl@kernel.org> wrote:
>
> On Wed, Mar 18, 2026 at 3:25 PM Arnd Bergmann <arnd@arndb.de> wrote:
> >
> > On Wed, Mar 18, 2026, at 14:48, Bartosz Golaszewski wrote:
> > > Headers exposing symbols specific to individual GPIO drivers should all
> > > live under linux/gpio/ for consistency. scx200_gpio.h is currently a
> > > top-level header directly under linux/. Move it and update all users.
> > >
> > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> > > ---
> > > With Acks from relevant maintainers, I can take it through the GPIO
> > > tree.
> >
> > No objections to the change, but I'd point out that while this is a
> > driver for gpio registers, it's not a gpiolib driver but rather a
> > custom chardev with ioctl interface.
> >
>
> Yeah I wasn't sure if we consider linux/gpio/ as a GPIOLIB directory
> or just GPIO in general. I figured it may as well be the latter.
>
> Bart
>
> > Since the chip was never as popular as the separate geode/cs553x
> > ones, I wonder if there are any users left, maybe Jim has an idea.
> >

I have no idea either way.
I still have the HW, but its been unplugged for years
dusting it off has been on the list, but way down.

> > If there are users, they might be able to use drivers/gpio/gpio-cs5535.c
> > instead, but I have not checked if the two are compatible.
> >

On Wed, Mar 18, 2026 at 02:48:38PM +0100, Bartosz Golaszewski wrote:
> Headers exposing symbols specific to individual GPIO drivers should all
> live under linux/gpio/ for consistency. scx200_gpio.h is currently a
> top-level header directly under linux/. Move it and update all users.
> 
> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> ---
> With Acks from relevant maintainers, I can take it through the GPIO
> tree.

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>