Re: [PATCHv3 01/14] gpio: mcp23s08: move to pinctrl

[Sylvain Lemieux]

On Mon, 2017-05-15 at 11:24 +0200, Sebastian Reichel wrote:
> This moves the mcp23s08 driver from gpio to pinctrl. Actual
> pinctrl support for configuration of the pull-up resistors
> follows in its own patch.
> 
> Signed-off-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxxxx>
> ---
>  arch/arm/configs/lpc32xx_defconfig                      |  2 +-
>  arch/blackfin/configs/BF609-EZKIT_defconfig             |  2 +-
>  arch/blackfin/mach-bf527/boards/tll6527m.c              |  4 ++--
>  arch/blackfin/mach-bf609/boards/ezkit.c                 |  4 ++--
>  drivers/gpio/Kconfig                                    | 17 -----------------
>  drivers/gpio/Makefile                                   |  1 -
>  drivers/pinctrl/Kconfig                                 | 13 +++++++++++++
>  drivers/pinctrl/Makefile                                |  1 +
>  .../gpio-mcp23s08.c => pinctrl/pinctrl-mcp23s08.c}      |  0
>  9 files changed, 20 insertions(+), 24 deletions(-)
>  rename drivers/{gpio/gpio-mcp23s08.c => pinctrl/pinctrl-mcp23s08.c} (100%)
> 
> diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_defconfig
> index 6ba430d2b5b2..e15fa5f168bb 100644
> --- a/arch/arm/configs/lpc32xx_defconfig
> +++ b/arch/arm/configs/lpc32xx_defconfig
> @@ -112,7 +112,7 @@ CONFIG_GPIO_SX150X=y
>  CONFIG_GPIO_74X164=y
>  CONFIG_GPIO_MAX7301=y
>  CONFIG_GPIO_MC33880=y
> -CONFIG_GPIO_MCP23S08=y
> +CONFIG_PINCTRL_MCP23S08=y
>  CONFIG_SENSORS_DS620=y
>  CONFIG_SENSORS_MAX6639=y
>  CONFIG_WATCHDOG=y

Acked-by: Sylvain Lemieux <slemieux.tyco@xxxxxxxxx>

[...]

> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index 23ca51ee6b28..5f88d7324e02 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -1227,23 +1227,6 @@ config GPIO_PISOSR
>  
>  endmenu
>  
> -menu "SPI or I2C GPIO expanders"
> -	depends on (SPI_MASTER && !I2C) || I2C
> -
> -config GPIO_MCP23S08
> -	tristate "Microchip MCP23xxx I/O expander"
> -	depends on OF_GPIO
> -	select GPIOLIB_IRQCHIP
> -	select REGMAP_I2C if I2C
> -	select REGMAP if SPI_MASTER
> -	help
> -	  SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017
> -	  I/O expanders.
> -	  This provides a GPIO interface supporting inputs and outputs.
> -	  The I2C versions of the chips can be used as interrupt-controller.
> -
> -endmenu
> -
>  menu "USB GPIO expanders"
>  	depends on USB
>  
> diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
> index 68b96277d9fa..89f10061a5c1 100644
> --- a/drivers/gpio/Makefile
> +++ b/drivers/gpio/Makefile
> @@ -77,7 +77,6 @@ obj-$(CONFIG_GPIO_MENZ127)	+= gpio-menz127.o
>  obj-$(CONFIG_GPIO_MERRIFIELD)	+= gpio-merrifield.o
>  obj-$(CONFIG_GPIO_MC33880)	+= gpio-mc33880.o
>  obj-$(CONFIG_GPIO_MC9S08DZ60)	+= gpio-mc9s08dz60.o
> -obj-$(CONFIG_GPIO_MCP23S08)	+= gpio-mcp23s08.o
>  obj-$(CONFIG_GPIO_ML_IOH)	+= gpio-ml-ioh.o
>  obj-$(CONFIG_GPIO_MM_LANTIQ)	+= gpio-mm-lantiq.o
>  obj-$(CONFIG_GPIO_MOCKUP)      += gpio-mockup.o
> diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
> index 37af5e3029d5..b5aa50c51633 100644
> --- a/drivers/pinctrl/Kconfig
> +++ b/drivers/pinctrl/Kconfig
> @@ -146,6 +146,19 @@ config PINCTRL_FALCON
>  	depends on SOC_FALCON
>  	depends on PINCTRL_LANTIQ
>  
> +config PINCTRL_MCP23S08
> +	tristate "Microchip MCP23xxx I/O expander"
> +	depends on OF_GPIO
> +	depends on SPI_MASTER || I2C
> +	select GPIOLIB_IRQCHIP
> +	select REGMAP_I2C if I2C
> +	select REGMAP_SPI if SPI_MASTER
> +	help
> +	  SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017
> +	  I/O expanders.
> +	  This provides a GPIO interface supporting inputs and outputs.
> +	  The I2C versions of the chips can be used as interrupt-controller.
> +
>  config PINCTRL_MESON
>  	bool
>  	depends on OF
> diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
> index 0e9b2226a7c2..59d793aa3db3 100644
> --- a/drivers/pinctrl/Makefile
> +++ b/drivers/pinctrl/Makefile
> @@ -19,6 +19,7 @@ obj-$(CONFIG_PINCTRL_DA850_PUPD) += pinctrl-da850-pupd.o
>  obj-$(CONFIG_PINCTRL_DIGICOLOR)	+= pinctrl-digicolor.o
>  obj-$(CONFIG_PINCTRL_FALCON)	+= pinctrl-falcon.o
>  obj-$(CONFIG_PINCTRL_MAX77620)	+= pinctrl-max77620.o
> +obj-$(CONFIG_PINCTRL_MCP23S08)	+= pinctrl-mcp23s08.o
>  obj-$(CONFIG_PINCTRL_MESON)	+= meson/
>  obj-$(CONFIG_PINCTRL_OXNAS)	+= pinctrl-oxnas.o
>  obj-$(CONFIG_PINCTRL_PALMAS)	+= pinctrl-palmas.o
> diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c
> similarity index 100%
> rename from drivers/gpio/gpio-mcp23s08.c
> rename to drivers/pinctrl/pinctrl-mcp23s08.c