Browse Source

GPIO: TPS65910: Move driver to drivers/gpio/

The GPIO driver should reside in drivers/gpio/ for better
organization.

Signed-off-by: Jorge Eduardo Candelaria <jedu@slimlogic.co.uk>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Jorge Eduardo Candelaria 14 years ago
parent
commit
83545d836c
5 changed files with 11 additions and 2 deletions
  1. 7 0
      drivers/gpio/Kconfig
  2. 1 0
      drivers/gpio/Makefile
  3. 0 0
      drivers/gpio/tps65910-gpio.c
  4. 2 1
      drivers/mfd/Kconfig
  5. 1 1
      drivers/mfd/Makefile

+ 7 - 0
drivers/gpio/Kconfig

@@ -424,4 +424,11 @@ config AB8500_GPIO
 	depends on AB8500_CORE && BROKEN
 	depends on AB8500_CORE && BROKEN
 	help
 	help
 	  Select this to enable the AB8500 IC GPIO driver
 	  Select this to enable the AB8500 IC GPIO driver
+
+config GPIO_TPS65910
+	bool "TPS65910 GPIO"
+	depends on MFD_TPS65910
+	help
+	  Select this option to enable GPIO driver for the TPS65910
+	  chip family.
 endif
 endif

+ 1 - 0
drivers/gpio/Makefile

@@ -40,3 +40,4 @@ obj-$(CONFIG_GPIO_SX150X)	+= sx150x.o
 obj-$(CONFIG_GPIO_VX855)	+= vx855_gpio.o
 obj-$(CONFIG_GPIO_VX855)	+= vx855_gpio.o
 obj-$(CONFIG_GPIO_ML_IOH)	+= ml_ioh_gpio.o
 obj-$(CONFIG_GPIO_ML_IOH)	+= ml_ioh_gpio.o
 obj-$(CONFIG_AB8500_GPIO)       += ab8500-gpio.o
 obj-$(CONFIG_AB8500_GPIO)       += ab8500-gpio.o
+obj-$(CONFIG_GPIO_TPS65910)	+= tps65910-gpio.o

+ 0 - 0
drivers/mfd/tps65910-gpio.c → drivers/gpio/tps65910-gpio.c


+ 2 - 1
drivers/mfd/Kconfig

@@ -721,8 +721,9 @@ config MFD_PM8XXX_IRQ
 
 
 config MFD_TPS65910
 config MFD_TPS65910
 	bool "TPS65910 Power Management chip"
 	bool "TPS65910 Power Management chip"
-	depends on I2C=y && GPIOLIB
+	depends on I2C=y
 	select MFD_CORE
 	select MFD_CORE
+	select GPIO_TPS65910
 	help
 	help
 	  if you say yes here you get support for the TPS65910 series of
 	  if you say yes here you get support for the TPS65910 series of
 	  Power Management chips.
 	  Power Management chips.

+ 1 - 1
drivers/mfd/Makefile

@@ -93,4 +93,4 @@ obj-$(CONFIG_MFD_CS5535)	+= cs5535-mfd.o
 obj-$(CONFIG_MFD_OMAP_USB_HOST)	+= omap-usb-host.o
 obj-$(CONFIG_MFD_OMAP_USB_HOST)	+= omap-usb-host.o
 obj-$(CONFIG_MFD_PM8921_CORE) 	+= pm8921-core.o
 obj-$(CONFIG_MFD_PM8921_CORE) 	+= pm8921-core.o
 obj-$(CONFIG_MFD_PM8XXX_IRQ) 	+= pm8xxx-irq.o
 obj-$(CONFIG_MFD_PM8XXX_IRQ) 	+= pm8xxx-irq.o
-obj-$(CONFIG_MFD_TPS65910)	+= tps65910.o tps65910-gpio.o tps65910-irq.o
+obj-$(CONFIG_MFD_TPS65910)	+= tps65910.o tps65910-irq.o