Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 449317a8 authored by Quentin Schulz's avatar Quentin Schulz Committed by Linus Walleij
Browse files

pinctrl: move gpio-axp209 to pinctrl 



To prepare the driver for the upcoming pinctrl features, move the GPIO
driver AXP209 from GPIO to pinctrl subsystem.

Signed-off-by: default avatarQuentin Schulz <quentin.schulz@free-electrons.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 3cac991e

drivers/gpio/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -122,12 +122,6 @@ config GPIO_ATH79 
	  Select this option to enable GPIO driver for

	  Atheros AR71XX/AR724X/AR913X SoC devices.



config GPIO_AXP209

	tristate "X-Powers AXP209 PMIC GPIO Support"

	depends on MFD_AXP20X

	help

	  Say yes to enable GPIO support for the AXP209 PMIC



config GPIO_BCM_KONA

	bool "Broadcom Kona GPIO"

	depends on OF_GPIO && (ARCH_BCM_MOBILE || COMPILE_TEST)

drivers/gpio/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ obj-$(CONFIG_GPIO_AMDPT) += gpio-amdpt.o 
obj-$(CONFIG_GPIO_ARIZONA)	+= gpio-arizona.o

obj-$(CONFIG_GPIO_ATH79)	+= gpio-ath79.o

obj-$(CONFIG_GPIO_ASPEED)	+= gpio-aspeed.o

obj-$(CONFIG_GPIO_AXP209)	+= gpio-axp209.o

obj-$(CONFIG_GPIO_BCM_KONA)	+= gpio-bcm-kona.o

obj-$(CONFIG_GPIO_BD9571MWV)	+= gpio-bd9571mwv.o

obj-$(CONFIG_GPIO_BRCMSTB)	+= gpio-brcmstb.o

drivers/pinctrl/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -63,6 +63,16 @@ config PINCTRL_AS3722 
	  open drain configuration for the GPIO pins of AS3722 devices. It also

	  supports the GPIO functionality through gpiolib.



config PINCTRL_AXP209

	tristate "X-Powers AXP209 PMIC pinctrl and GPIO Support"

	depends on MFD_AXP20X

	help

	  AXP PMICs provides multiple GPIOs that can be muxed for different

	  functions. This driver bundles a pinctrl driver to select the function

	  muxing and a GPIO driver to handle the GPIO when the GPIO function is

	  selected.

	  Say yes to enable pinctrl and GPIO support for the AXP209 PMIC



config PINCTRL_BF54x

	def_bool y if BF54x

	select PINCTRL_ADI2

drivers/pinctrl/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o 
obj-$(CONFIG_PINCTRL_ADI2)	+= pinctrl-adi2.o

obj-$(CONFIG_PINCTRL_ARTPEC6)	+= pinctrl-artpec6.o

obj-$(CONFIG_PINCTRL_AS3722)	+= pinctrl-as3722.o

obj-$(CONFIG_PINCTRL_AXP209)	+= pinctrl-axp209.o

obj-$(CONFIG_PINCTRL_BF54x)	+= pinctrl-adi2-bf54x.o

obj-$(CONFIG_PINCTRL_BF60x)	+= pinctrl-adi2-bf60x.o

obj-$(CONFIG_PINCTRL_AT91)	+= pinctrl-at91.o