diff mbox

mfd/gpio: move HTC GPIO driver to GPIO subsystem

Message ID 1474026770-22595-1-git-send-email-linus.walleij@linaro.org
State New
Headers show

Commit Message

Linus Walleij Sept. 16, 2016, 11:52 a.m. UTC 
The HTC GPIO driver is a pure GPIO driver and I just can not
see what it is doing inside MFD. Let's just move it to GPIO
and take this opportunity to move the platform data to
<linux/platform_data/gpio-htc-egpio.h>

Cc: arm@kernel.org
Cc: Russell King <linux@armlinux.org.uk>
Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

---
Lee if you're OK with this I will provide an immutable branch
for you to pull this into MFD as well (or if you prefer to
prep it, be my guest...)

Russell/ARM SoC: heads-up and ACK request.
---
 arch/arm/mach-pxa/hx4700.c                                        | 2 +-
 arch/arm/mach-pxa/magician.c                                      | 2 +-
 arch/arm/mach-sa1100/h3xxx.c                                      | 2 +-
 drivers/gpio/Kconfig                                              | 8 ++++++++
 drivers/gpio/Makefile                                             | 1 +
 drivers/{mfd/htc-egpio.c => gpio/gpio-htc-egpio.c}                | 2 +-
 drivers/mfd/Kconfig                                               | 8 --------
 drivers/mfd/Makefile                                              | 1 -
 include/linux/{mfd/htc-egpio.h => platform_data/gpio-htc-egpio.h} | 0
 9 files changed, 13 insertions(+), 13 deletions(-)
 rename drivers/{mfd/htc-egpio.c => gpio/gpio-htc-egpio.c} (99%)
 rename include/linux/{mfd/htc-egpio.h => platform_data/gpio-htc-egpio.h} (100%)

-- 
2.7.4

Comments

Arnd Bergmann Sept. 19, 2016, 10:19 p.m. UTC | #1 
On Friday, September 16, 2016 1:52:50 PM CEST Linus Walleij wrote:
> The HTC GPIO driver is a pure GPIO driver and I just can not

> see what it is doing inside MFD. Let's just move it to GPIO

> and take this opportunity to move the platform data to

> <linux/platform_data/gpio-htc-egpio.h>

> 

> Cc: arm@kernel.org

> Cc: Russell King <linux@armlinux.org.uk>

> Cc: Lee Jones <lee.jones@linaro.org>

> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

> ---

> Lee if you're OK with this I will provide an immutable branch

> for you to pull this into MFD as well (or if you prefer to

> prep it, be my guest...)

> 

> Russell/ARM SoC: heads-up and ACK request.

> ---

>  arch/arm/mach-pxa/hx4700.c                                        | 2 +-

>  arch/arm/mach-pxa/magician.c                                      | 2 +-

>  arch/arm/mach-sa1100/h3xxx.c                                      | 2 +-

> 


Acked-by: Arnd Bergmann <arnd@arndb.de>
Russell King (Oracle) Sept. 19, 2016, 10:33 p.m. UTC | #2 
On Fri, Sep 16, 2016 at 01:52:50PM +0200, Linus Walleij wrote:
> Russell/ARM SoC: heads-up and ACK request.


Fine with one exception:

> diff --git a/arch/arm/mach-sa1100/h3xxx.c b/arch/arm/mach-sa1100/h3xxx.c

> index b1d4faa12f9a..75ab3b086e6f 100644

> --- a/arch/arm/mach-sa1100/h3xxx.c

> +++ b/arch/arm/mach-sa1100/h3xxx.c

> @@ -14,7 +14,7 @@

>  #include <linux/gpio.h>

>  #include <linux/gpio_keys.h>

>  #include <linux/input.h>

> -#include <linux/mfd/htc-egpio.h>

> +#include <linux/platform_data/gpio-htc-egpio.h>

>  #include <linux/mtd/mtd.h>

>  #include <linux/mtd/partitions.h>

>  #include <linux/platform_data/sa11x0-serial.h>


The includes here are arranged alphabetically with the exception of
linux/kernel.h, as per commit 4aa975558065 ("ARM: 5822/1: SA1100:
h3100/h3600: clean up #includes") - please keep them alphabetical.

Thanks.

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
Linus Walleij Sept. 23, 2016, 9:43 a.m. UTC | #3 
On Tue, Sep 20, 2016 at 12:33 AM, Russell King - ARM Linux
<linux@armlinux.org.uk> wrote:
> On Fri, Sep 16, 2016 at 01:52:50PM +0200, Linus Walleij wrote:

>> Russell/ARM SoC: heads-up and ACK request.

>

> Fine with one exception:

>

>> diff --git a/arch/arm/mach-sa1100/h3xxx.c b/arch/arm/mach-sa1100/h3xxx.c

>> index b1d4faa12f9a..75ab3b086e6f 100644

>> --- a/arch/arm/mach-sa1100/h3xxx.c

>> +++ b/arch/arm/mach-sa1100/h3xxx.c

>> @@ -14,7 +14,7 @@

>>  #include <linux/gpio.h>

>>  #include <linux/gpio_keys.h>

>>  #include <linux/input.h>

>> -#include <linux/mfd/htc-egpio.h>

>> +#include <linux/platform_data/gpio-htc-egpio.h>

>>  #include <linux/mtd/mtd.h>

>>  #include <linux/mtd/partitions.h>

>>  #include <linux/platform_data/sa11x0-serial.h>

>

> The includes here are arranged alphabetically with the exception of

> linux/kernel.h, as per commit 4aa975558065 ("ARM: 5822/1: SA1100:

> h3100/h3600: clean up #includes") - please keep them alphabetical.


Sorry about that. Fixing up and providing the branch.

Yours,
Linus Walleij
Lee Jones Sept. 27, 2016, 7:47 p.m. UTC | #4 
On Fri, 16 Sep 2016, Linus Walleij wrote:

> The HTC GPIO driver is a pure GPIO driver and I just can not

> see what it is doing inside MFD. Let's just move it to GPIO

> and take this opportunity to move the platform data to

> <linux/platform_data/gpio-htc-egpio.h>

> 

> Cc: arm@kernel.org

> Cc: Russell King <linux@armlinux.org.uk>

> Cc: Lee Jones <lee.jones@linaro.org>

> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

> ---

> Lee if you're OK with this I will provide an immutable branch

> for you to pull this into MFD as well (or if you prefer to

> prep it, be my guest...)


Acked-by: Lee Jones <lee.jones@linaro.org>


I look forward to your pull-request.

> Russell/ARM SoC: heads-up and ACK request.

> ---

>  arch/arm/mach-pxa/hx4700.c                                        | 2 +-

>  arch/arm/mach-pxa/magician.c                                      | 2 +-

>  arch/arm/mach-sa1100/h3xxx.c                                      | 2 +-

>  drivers/gpio/Kconfig                                              | 8 ++++++++

>  drivers/gpio/Makefile                                             | 1 +

>  drivers/{mfd/htc-egpio.c => gpio/gpio-htc-egpio.c}                | 2 +-

>  drivers/mfd/Kconfig                                               | 8 --------

>  drivers/mfd/Makefile                                              | 1 -

>  include/linux/{mfd/htc-egpio.h => platform_data/gpio-htc-egpio.h} | 0

>  9 files changed, 13 insertions(+), 13 deletions(-)

>  rename drivers/{mfd/htc-egpio.c => gpio/gpio-htc-egpio.c} (99%)

>  rename include/linux/{mfd/htc-egpio.h => platform_data/gpio-htc-egpio.h} (100%)

> 

> diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c

> index 4a2f9aba93ea..d3ac2363a34b 100644

> --- a/arch/arm/mach-pxa/hx4700.c

> +++ b/arch/arm/mach-pxa/hx4700.c

> @@ -24,7 +24,7 @@

>  #include <linux/input.h>

>  #include <linux/input/navpoint.h>

>  #include <linux/lcd.h>

> -#include <linux/mfd/htc-egpio.h>

> +#include <linux/platform_data/gpio-htc-egpio.h>

>  #include <linux/mfd/asic3.h>

>  #include <linux/mtd/physmap.h>

>  #include <linux/pda_power.h>

> diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c

> index abc918169367..d656bb2c3b66 100644

> --- a/arch/arm/mach-pxa/magician.c

> +++ b/arch/arm/mach-pxa/magician.c

> @@ -20,7 +20,7 @@

>  #include <linux/gpio.h>

>  #include <linux/gpio_keys.h>

>  #include <linux/input.h>

> -#include <linux/mfd/htc-egpio.h>

> +#include <linux/platform_data/gpio-htc-egpio.h>

>  #include <linux/mfd/htc-pasic3.h>

>  #include <linux/mtd/physmap.h>

>  #include <linux/pda_power.h>

> diff --git a/arch/arm/mach-sa1100/h3xxx.c b/arch/arm/mach-sa1100/h3xxx.c

> index b1d4faa12f9a..75ab3b086e6f 100644

> --- a/arch/arm/mach-sa1100/h3xxx.c

> +++ b/arch/arm/mach-sa1100/h3xxx.c

> @@ -14,7 +14,7 @@

>  #include <linux/gpio.h>

>  #include <linux/gpio_keys.h>

>  #include <linux/input.h>

> -#include <linux/mfd/htc-egpio.h>

> +#include <linux/platform_data/gpio-htc-egpio.h>

>  #include <linux/mtd/mtd.h>

>  #include <linux/mtd/partitions.h>

>  #include <linux/platform_data/sa11x0-serial.h>

> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig

> index 98dd47a30fc7..03be200619a4 100644

> --- a/drivers/gpio/Kconfig

> +++ b/drivers/gpio/Kconfig

> @@ -848,6 +848,14 @@ config GPIO_DLN2

>  	  This driver can also be built as a module. If so, the module

>  	  will be called gpio-dln2.

>  

> +config HTC_EGPIO

> +	bool "HTC EGPIO support"

> +	depends on GPIOLIB && ARM

> +	help

> +	    This driver supports the CPLD egpio chip present on

> +	    several HTC phones.  It provides basic support for input

> +	    pins, output pins, and irqs.

> +

>  config GPIO_JANZ_TTL

>  	tristate "Janz VMOD-TTL Digital IO Module"

>  	depends on MFD_JANZ_CMODIO

> diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile

> index 2a035ed8f168..32ebc07074ed 100644

> --- a/drivers/gpio/Makefile

> +++ b/drivers/gpio/Makefile

> @@ -45,6 +45,7 @@ obj-$(CONFIG_GPIO_ETRAXFS)	+= gpio-etraxfs.o

>  obj-$(CONFIG_GPIO_F7188X)	+= gpio-f7188x.o

>  obj-$(CONFIG_GPIO_GE_FPGA)	+= gpio-ge.o

>  obj-$(CONFIG_GPIO_GRGPIO)	+= gpio-grgpio.o

> +obj-$(CONFIG_HTC_EGPIO)		+= gpio-htc-egpio.o

>  obj-$(CONFIG_GPIO_ICH)		+= gpio-ich.o

>  obj-$(CONFIG_GPIO_IOP)		+= gpio-iop.o

>  obj-$(CONFIG_GPIO_IT87)		+= gpio-it87.o

> diff --git a/drivers/mfd/htc-egpio.c b/drivers/gpio/gpio-htc-egpio.c

> similarity index 99%

> rename from drivers/mfd/htc-egpio.c

> rename to drivers/gpio/gpio-htc-egpio.c

> index 513cfc5c8fb6..7edb980d5188 100644

> --- a/drivers/mfd/htc-egpio.c

> +++ b/drivers/gpio/gpio-htc-egpio.c

> @@ -17,7 +17,7 @@

>  #include <linux/platform_device.h>

>  #include <linux/slab.h>

>  #include <linux/module.h>

> -#include <linux/mfd/htc-egpio.h>

> +#include <linux/platform_data/gpio-htc-egpio.h>

>  

>  struct egpio_chip {

>  	int              reg_start;

> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig

> index 2d1fb6420592..8634d60837fc 100644

> --- a/drivers/mfd/Kconfig

> +++ b/drivers/mfd/Kconfig

> @@ -340,14 +340,6 @@ config MFD_HI655X_PMIC

>  	help

>  	  Select this option to enable Hisilicon hi655x series pmic driver.

>  

> -config HTC_EGPIO

> -	bool "HTC EGPIO support"

> -	depends on GPIOLIB && ARM

> -	help

> -	    This driver supports the CPLD egpio chip present on

> -	    several HTC phones.  It provides basic support for input

> -	    pins, output pins, and irqs.

> -

>  config HTC_PASIC3

>  	tristate "HTC PASIC3 LED/DS1WM chip support"

>  	select MFD_CORE

> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile

> index 2ba3ba35f745..a5f1bf153b64 100644

> --- a/drivers/mfd/Makefile

> +++ b/drivers/mfd/Makefile

> @@ -18,7 +18,6 @@ rtsx_pci-objs			:= rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o

>  obj-$(CONFIG_MFD_RTSX_PCI)	+= rtsx_pci.o

>  obj-$(CONFIG_MFD_RTSX_USB)	+= rtsx_usb.o

>  

> -obj-$(CONFIG_HTC_EGPIO)		+= htc-egpio.o

>  obj-$(CONFIG_HTC_PASIC3)	+= htc-pasic3.o

>  obj-$(CONFIG_HTC_I2CPLD)	+= htc-i2cpld.o

>  

> diff --git a/include/linux/mfd/htc-egpio.h b/include/linux/platform_data/gpio-htc-egpio.h

> similarity index 100%

> rename from include/linux/mfd/htc-egpio.h

> rename to include/linux/platform_data/gpio-htc-egpio.h


-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
diff mbox

Patch

diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index 4a2f9aba93ea..d3ac2363a34b 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -24,7 +24,7 @@ 
 #include <linux/input.h>
 #include <linux/input/navpoint.h>
 #include <linux/lcd.h>
-#include <linux/mfd/htc-egpio.h>
+#include <linux/platform_data/gpio-htc-egpio.h>
 #include <linux/mfd/asic3.h>
 #include <linux/mtd/physmap.h>
 #include <linux/pda_power.h>
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index abc918169367..d656bb2c3b66 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -20,7 +20,7 @@ 
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
-#include <linux/mfd/htc-egpio.h>
+#include <linux/platform_data/gpio-htc-egpio.h>
 #include <linux/mfd/htc-pasic3.h>
 #include <linux/mtd/physmap.h>
 #include <linux/pda_power.h>
diff --git a/arch/arm/mach-sa1100/h3xxx.c b/arch/arm/mach-sa1100/h3xxx.c
index b1d4faa12f9a..75ab3b086e6f 100644
--- a/arch/arm/mach-sa1100/h3xxx.c
+++ b/arch/arm/mach-sa1100/h3xxx.c
@@ -14,7 +14,7 @@ 
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
-#include <linux/mfd/htc-egpio.h>
+#include <linux/platform_data/gpio-htc-egpio.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_data/sa11x0-serial.h>
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 98dd47a30fc7..03be200619a4 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -848,6 +848,14 @@  config GPIO_DLN2
 	  This driver can also be built as a module. If so, the module
 	  will be called gpio-dln2.
 
+config HTC_EGPIO
+	bool "HTC EGPIO support"
+	depends on GPIOLIB && ARM
+	help
+	    This driver supports the CPLD egpio chip present on
+	    several HTC phones.  It provides basic support for input
+	    pins, output pins, and irqs.
+
 config GPIO_JANZ_TTL
 	tristate "Janz VMOD-TTL Digital IO Module"
 	depends on MFD_JANZ_CMODIO
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 2a035ed8f168..32ebc07074ed 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -45,6 +45,7 @@  obj-$(CONFIG_GPIO_ETRAXFS)	+= gpio-etraxfs.o
 obj-$(CONFIG_GPIO_F7188X)	+= gpio-f7188x.o
 obj-$(CONFIG_GPIO_GE_FPGA)	+= gpio-ge.o
 obj-$(CONFIG_GPIO_GRGPIO)	+= gpio-grgpio.o
+obj-$(CONFIG_HTC_EGPIO)		+= gpio-htc-egpio.o
 obj-$(CONFIG_GPIO_ICH)		+= gpio-ich.o
 obj-$(CONFIG_GPIO_IOP)		+= gpio-iop.o
 obj-$(CONFIG_GPIO_IT87)		+= gpio-it87.o
diff --git a/drivers/mfd/htc-egpio.c b/drivers/gpio/gpio-htc-egpio.c
similarity index 99%
rename from drivers/mfd/htc-egpio.c
rename to drivers/gpio/gpio-htc-egpio.c
index 513cfc5c8fb6..7edb980d5188 100644
--- a/drivers/mfd/htc-egpio.c
+++ b/drivers/gpio/gpio-htc-egpio.c
@@ -17,7 +17,7 @@ 
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <linux/mfd/htc-egpio.h>
+#include <linux/platform_data/gpio-htc-egpio.h>
 
 struct egpio_chip {
 	int              reg_start;
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 2d1fb6420592..8634d60837fc 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -340,14 +340,6 @@  config MFD_HI655X_PMIC
 	help
 	  Select this option to enable Hisilicon hi655x series pmic driver.
 
-config HTC_EGPIO
-	bool "HTC EGPIO support"
-	depends on GPIOLIB && ARM
-	help
-	    This driver supports the CPLD egpio chip present on
-	    several HTC phones.  It provides basic support for input
-	    pins, output pins, and irqs.
-
 config HTC_PASIC3
 	tristate "HTC PASIC3 LED/DS1WM chip support"
 	select MFD_CORE
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 2ba3ba35f745..a5f1bf153b64 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -18,7 +18,6 @@  rtsx_pci-objs			:= rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o
 obj-$(CONFIG_MFD_RTSX_PCI)	+= rtsx_pci.o
 obj-$(CONFIG_MFD_RTSX_USB)	+= rtsx_usb.o
 
-obj-$(CONFIG_HTC_EGPIO)		+= htc-egpio.o
 obj-$(CONFIG_HTC_PASIC3)	+= htc-pasic3.o
 obj-$(CONFIG_HTC_I2CPLD)	+= htc-i2cpld.o
 
diff --git a/include/linux/mfd/htc-egpio.h b/include/linux/platform_data/gpio-htc-egpio.h
similarity index 100%
rename from include/linux/mfd/htc-egpio.h
rename to include/linux/platform_data/gpio-htc-egpio.h