[v1,1/8] pinctrl: lynxpoint: Move GPIO driver to pin controller folder
diff mbox series

Message ID 20191106144829.32275-2-andriy.shevchenko@linux.intel.com
State New
Headers show
Series
  • [v1,1/8] pinctrl: lynxpoint: Move GPIO driver to pin controller folder
Related show

Commit Message

andriy.shevchenko@linux.intel.com Nov. 6, 2019, 2:48 p.m. UTC
Move Lynxpoint GPIO driver under Intel pin control umbrella
for further transformation to a real pin control driver.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 MAINTAINERS                                            |  1 -
 drivers/gpio/Kconfig                                   |  8 --------
 drivers/gpio/Makefile                                  |  1 -
 drivers/pinctrl/intel/Kconfig                          | 10 ++++++++++
 drivers/pinctrl/intel/Makefile                         |  1 +
 .../intel/pinctrl-lynxpoint.c}                         |  0
 6 files changed, 11 insertions(+), 10 deletions(-)
 rename drivers/{gpio/gpio-lynxpoint.c => pinctrl/intel/pinctrl-lynxpoint.c} (100%)

Comments

Mika Westerberg Nov. 7, 2019, 1:48 p.m. UTC | #1
On Wed, Nov 06, 2019 at 04:48:22PM +0200, Andy Shevchenko wrote:
> Move Lynxpoint GPIO driver under Intel pin control umbrella
> for further transformation to a real pin control driver.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  MAINTAINERS                                            |  1 -
>  drivers/gpio/Kconfig                                   |  8 --------
>  drivers/gpio/Makefile                                  |  1 -
>  drivers/pinctrl/intel/Kconfig                          | 10 ++++++++++
>  drivers/pinctrl/intel/Makefile                         |  1 +
>  .../intel/pinctrl-lynxpoint.c}                         |  0
>  6 files changed, 11 insertions(+), 10 deletions(-)
>  rename drivers/{gpio/gpio-lynxpoint.c => pinctrl/intel/pinctrl-lynxpoint.c} (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 1378491c223c..9b71250e3014 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -8325,7 +8325,6 @@ S:	Maintained
>  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
>  F:	drivers/gpio/gpio-ich.c
>  F:	drivers/gpio/gpio-intel-mid.c
> -F:	drivers/gpio/gpio-lynxpoint.c
>  F:	drivers/gpio/gpio-merrifield.c
>  F:	drivers/gpio/gpio-ml-ioh.c
>  F:	drivers/gpio/gpio-pch.c
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index 8adffd42f8cb..6923142fd874 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -335,14 +335,6 @@ config GPIO_LPC32XX
>  	  Select this option to enable GPIO driver for
>  	  NXP LPC32XX devices.
>  
> -config GPIO_LYNXPOINT
> -	tristate "Intel Lynxpoint GPIO support"
> -	depends on ACPI && X86
> -	select GPIOLIB_IRQCHIP
> -	help
> -	  driver for GPIO functionality on Intel Lynxpoint PCH chipset
> -	  Requires ACPI device enumeration code to set up a platform device.
> -
>  config GPIO_MB86S7X
>  	tristate "GPIO support for Fujitsu MB86S7x Platforms"
>  	help
> diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
> index 34eb8b2b12dd..55b2b645391e 100644
> --- a/drivers/gpio/Makefile
> +++ b/drivers/gpio/Makefile
> @@ -76,7 +76,6 @@ obj-$(CONFIG_GPIO_LP873X)		+= gpio-lp873x.o
>  obj-$(CONFIG_GPIO_LP87565)		+= gpio-lp87565.o
>  obj-$(CONFIG_GPIO_LPC18XX)		+= gpio-lpc18xx.o
>  obj-$(CONFIG_GPIO_LPC32XX)		+= gpio-lpc32xx.o
> -obj-$(CONFIG_GPIO_LYNXPOINT)		+= gpio-lynxpoint.o
>  obj-$(CONFIG_GPIO_MADERA)		+= gpio-madera.o
>  obj-$(CONFIG_GPIO_MAX3191X)		+= gpio-max3191x.o
>  obj-$(CONFIG_GPIO_MAX7300)		+= gpio-max7300.o
> diff --git a/drivers/pinctrl/intel/Kconfig b/drivers/pinctrl/intel/Kconfig
> index c091eb2f0aeb..260193c453b0 100644
> --- a/drivers/pinctrl/intel/Kconfig
> +++ b/drivers/pinctrl/intel/Kconfig
> @@ -42,6 +42,16 @@ config PINCTRL_MERRIFIELD
>  	  interface that allows configuring of SoC pins and using them as
>  	  GPIOs.
>  
> +config PINCTRL_LYNXPOINT
> +	tristate "Intel Lynxpoint pinctrl and GPIO driver"
> +	depends on ACPI
> +	select GPIOLIB
> +	select GPIOLIB_IRQCHIP
> +	help
> +	  Lynxpoint is the PCH of Intel Haswell. This pinctrl driver
> +	  provides an interface that allows configuring of PCH pins and
> +	  using them as GPIOs.

In order to keep the above (non pinctrl-intel.c based drivers) sorted
alphabetically, can you move this before PINCTRL_MERRIFIELD?

> +
>  config PINCTRL_INTEL
>  	tristate
>  	select PINMUX
> diff --git a/drivers/pinctrl/intel/Makefile b/drivers/pinctrl/intel/Makefile
> index 5e92aba018ac..541b94cfe398 100644
> --- a/drivers/pinctrl/intel/Makefile
> +++ b/drivers/pinctrl/intel/Makefile
> @@ -13,5 +13,6 @@ obj-$(CONFIG_PINCTRL_ELKHARTLAKE)	+= pinctrl-elkhartlake.o
>  obj-$(CONFIG_PINCTRL_GEMINILAKE)	+= pinctrl-geminilake.o
>  obj-$(CONFIG_PINCTRL_ICELAKE)		+= pinctrl-icelake.o
>  obj-$(CONFIG_PINCTRL_LEWISBURG)		+= pinctrl-lewisburg.o
> +obj-$(CONFIG_PINCTRL_LYNXPOINT)		+= pinctrl-lynxpoint.o

Here too.

>  obj-$(CONFIG_PINCTRL_SUNRISEPOINT)	+= pinctrl-sunrisepoint.o
>  obj-$(CONFIG_PINCTRL_TIGERLAKE)		+= pinctrl-tigerlake.o
> diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/pinctrl/intel/pinctrl-lynxpoint.c
> similarity index 100%
> rename from drivers/gpio/gpio-lynxpoint.c
> rename to drivers/pinctrl/intel/pinctrl-lynxpoint.c
> -- 
> 2.24.0.rc1
andriy.shevchenko@linux.intel.com Nov. 7, 2019, 2:47 p.m. UTC | #2
On Thu, Nov 07, 2019 at 03:48:42PM +0200, Mika Westerberg wrote:
> On Wed, Nov 06, 2019 at 04:48:22PM +0200, Andy Shevchenko wrote:
> > Move Lynxpoint GPIO driver under Intel pin control umbrella
> > for further transformation to a real pin control driver.

> > +config PINCTRL_LYNXPOINT
> > +	tristate "Intel Lynxpoint pinctrl and GPIO driver"
> > +	depends on ACPI
> > +	select GPIOLIB
> > +	select GPIOLIB_IRQCHIP
> > +	help
> > +	  Lynxpoint is the PCH of Intel Haswell. This pinctrl driver
> > +	  provides an interface that allows configuring of PCH pins and
> > +	  using them as GPIOs.
> 
> In order to keep the above (non pinctrl-intel.c based drivers) sorted
> alphabetically, can you move this before PINCTRL_MERRIFIELD?

Fixed in my review branch.

> > +obj-$(CONFIG_PINCTRL_LYNXPOINT)		+= pinctrl-lynxpoint.o
> 
> Here too.

Ditto.
Linus Walleij Nov. 13, 2019, 9:54 a.m. UTC | #3
On Wed, Nov 6, 2019 at 3:48 PM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:

This Kconfig symbol goes away:

> -config GPIO_LYNXPOINT

This one appears:

> +config PINCTRL_LYNXPOINT

As long as you're certain this will not cause any problems it's
fine by me (thinking people who have old configs etc).

Yours,
Linus Walleij
andriy.shevchenko@linux.intel.com Nov. 13, 2019, 1:40 p.m. UTC | #4
On Wed, Nov 13, 2019 at 10:54:28AM +0100, Linus Walleij wrote:
> On Wed, Nov 6, 2019 at 3:48 PM Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
> 
> This Kconfig symbol goes away:
> 
> > -config GPIO_LYNXPOINT
> 
> This one appears:
> 
> > +config PINCTRL_LYNXPOINT
> 
> As long as you're certain this will not cause any problems it's
> fine by me (thinking people who have old configs etc).

No. it's not a problem as long as people run `make oldconfig`.
We assume that distros do that way and carefully check each new option.
So, we consider no problem is here.

Patch
diff mbox series

diff --git a/MAINTAINERS b/MAINTAINERS
index 1378491c223c..9b71250e3014 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8325,7 +8325,6 @@  S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
 F:	drivers/gpio/gpio-ich.c
 F:	drivers/gpio/gpio-intel-mid.c
-F:	drivers/gpio/gpio-lynxpoint.c
 F:	drivers/gpio/gpio-merrifield.c
 F:	drivers/gpio/gpio-ml-ioh.c
 F:	drivers/gpio/gpio-pch.c
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 8adffd42f8cb..6923142fd874 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -335,14 +335,6 @@  config GPIO_LPC32XX
 	  Select this option to enable GPIO driver for
 	  NXP LPC32XX devices.
 
-config GPIO_LYNXPOINT
-	tristate "Intel Lynxpoint GPIO support"
-	depends on ACPI && X86
-	select GPIOLIB_IRQCHIP
-	help
-	  driver for GPIO functionality on Intel Lynxpoint PCH chipset
-	  Requires ACPI device enumeration code to set up a platform device.
-
 config GPIO_MB86S7X
 	tristate "GPIO support for Fujitsu MB86S7x Platforms"
 	help
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 34eb8b2b12dd..55b2b645391e 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -76,7 +76,6 @@  obj-$(CONFIG_GPIO_LP873X)		+= gpio-lp873x.o
 obj-$(CONFIG_GPIO_LP87565)		+= gpio-lp87565.o
 obj-$(CONFIG_GPIO_LPC18XX)		+= gpio-lpc18xx.o
 obj-$(CONFIG_GPIO_LPC32XX)		+= gpio-lpc32xx.o
-obj-$(CONFIG_GPIO_LYNXPOINT)		+= gpio-lynxpoint.o
 obj-$(CONFIG_GPIO_MADERA)		+= gpio-madera.o
 obj-$(CONFIG_GPIO_MAX3191X)		+= gpio-max3191x.o
 obj-$(CONFIG_GPIO_MAX7300)		+= gpio-max7300.o
diff --git a/drivers/pinctrl/intel/Kconfig b/drivers/pinctrl/intel/Kconfig
index c091eb2f0aeb..260193c453b0 100644
--- a/drivers/pinctrl/intel/Kconfig
+++ b/drivers/pinctrl/intel/Kconfig
@@ -42,6 +42,16 @@  config PINCTRL_MERRIFIELD
 	  interface that allows configuring of SoC pins and using them as
 	  GPIOs.
 
+config PINCTRL_LYNXPOINT
+	tristate "Intel Lynxpoint pinctrl and GPIO driver"
+	depends on ACPI
+	select GPIOLIB
+	select GPIOLIB_IRQCHIP
+	help
+	  Lynxpoint is the PCH of Intel Haswell. This pinctrl driver
+	  provides an interface that allows configuring of PCH pins and
+	  using them as GPIOs.
+
 config PINCTRL_INTEL
 	tristate
 	select PINMUX
diff --git a/drivers/pinctrl/intel/Makefile b/drivers/pinctrl/intel/Makefile
index 5e92aba018ac..541b94cfe398 100644
--- a/drivers/pinctrl/intel/Makefile
+++ b/drivers/pinctrl/intel/Makefile
@@ -13,5 +13,6 @@  obj-$(CONFIG_PINCTRL_ELKHARTLAKE)	+= pinctrl-elkhartlake.o
 obj-$(CONFIG_PINCTRL_GEMINILAKE)	+= pinctrl-geminilake.o
 obj-$(CONFIG_PINCTRL_ICELAKE)		+= pinctrl-icelake.o
 obj-$(CONFIG_PINCTRL_LEWISBURG)		+= pinctrl-lewisburg.o
+obj-$(CONFIG_PINCTRL_LYNXPOINT)		+= pinctrl-lynxpoint.o
 obj-$(CONFIG_PINCTRL_SUNRISEPOINT)	+= pinctrl-sunrisepoint.o
 obj-$(CONFIG_PINCTRL_TIGERLAKE)		+= pinctrl-tigerlake.o
diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/pinctrl/intel/pinctrl-lynxpoint.c
similarity index 100%
rename from drivers/gpio/gpio-lynxpoint.c
rename to drivers/pinctrl/intel/pinctrl-lynxpoint.c