diff options
| author | Jorge Eduardo Candelaria <jedu@slimlogic.co.uk> | 2011-05-16 18:35:37 -0500 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-05-27 10:49:29 +0100 |
| commit | 83545d836cf12a6381b530c5c7aeacf057f86aa9 (patch) | |
| tree | 321ed6d645b70a10995228c9595669828c5f8d9a /drivers | |
| parent | a2974732ca7614aaf0baf9d6dd3ad893d50ce1c5 (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/gpio/Makefile | 1 | ||||
| -rw-r--r-- | drivers/gpio/tps65910-gpio.c (renamed from drivers/mfd/tps65910-gpio.c) | 0 | ||||
| -rw-r--r-- | drivers/mfd/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/mfd/Makefile | 2 |
5 files changed, 11 insertions, 2 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index b57ec09af89..d2136460375 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -424,4 +424,11 @@ config AB8500_GPIO depends on AB8500_CORE && BROKEN help 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 diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index d92ce3a62ae..6a3387acc0e 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -40,3 +40,4 @@ obj-$(CONFIG_GPIO_SX150X) += sx150x.o obj-$(CONFIG_GPIO_VX855) += vx855_gpio.o obj-$(CONFIG_GPIO_ML_IOH) += ml_ioh_gpio.o obj-$(CONFIG_AB8500_GPIO) += ab8500-gpio.o +obj-$(CONFIG_GPIO_TPS65910) += tps65910-gpio.o diff --git a/drivers/mfd/tps65910-gpio.c b/drivers/gpio/tps65910-gpio.c index f3ae3765244..f3ae3765244 100644 --- a/drivers/mfd/tps65910-gpio.c +++ b/drivers/gpio/tps65910-gpio.c diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 4990a492a09..b6c267724e1 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -721,8 +721,9 @@ config MFD_PM8XXX_IRQ config MFD_TPS65910 bool "TPS65910 Power Management chip" - depends on I2C=y && GPIOLIB + depends on I2C=y select MFD_CORE + select GPIO_TPS65910 help if you say yes here you get support for the TPS65910 series of Power Management chips. diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index bdb8eab5668..efe3cc33ed9 100644 --- a/drivers/mfd/Makefile +++ b/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_PM8921_CORE) += pm8921-core.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 |