Commit 6518bb69 authored by Martyn Welch's avatar Martyn Welch Committed by Kumar Gala

gpio: Move GE GPIO driver to reside within GPIO subsystem

The GE GPIO driver provides basic support (set direction, read/write state)
for the GPIO provided on some GE single board computers. This patch moves
the driver from the 86xx specific platform directrory to the GPIO subsystem
so that it can be used on non-86xx boards.
Signed-off-by: default avatarMartyn Welch <martyn.welch@ge.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 330bbf48
...@@ -131,6 +131,7 @@ CONFIG_I2C=y ...@@ -131,6 +131,7 @@ CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MPC=y CONFIG_I2C_MPC=y
CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_GE_FPGA=y
CONFIG_SENSORS_LM90=y CONFIG_SENSORS_LM90=y
CONFIG_SENSORS_LM92=y CONFIG_SENSORS_LM92=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
......
...@@ -132,6 +132,7 @@ CONFIG_I2C=y ...@@ -132,6 +132,7 @@ CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MPC=y CONFIG_I2C_MPC=y
CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_GE_FPGA=y
CONFIG_SENSORS_LM90=y CONFIG_SENSORS_LM90=y
CONFIG_SENSORS_LM92=y CONFIG_SENSORS_LM92=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
......
...@@ -183,6 +183,8 @@ CONFIG_NVRAM=y ...@@ -183,6 +183,8 @@ CONFIG_NVRAM=y
CONFIG_I2C=y CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MPC=y CONFIG_I2C_MPC=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_GE_FPGA=y
CONFIG_SENSORS_LM90=y CONFIG_SENSORS_LM90=y
CONFIG_SENSORS_LM92=y CONFIG_SENSORS_LM92=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
......
...@@ -7,8 +7,7 @@ obj-$(CONFIG_SMP) += mpc86xx_smp.o ...@@ -7,8 +7,7 @@ obj-$(CONFIG_SMP) += mpc86xx_smp.o
obj-$(CONFIG_MPC8641_HPCN) += mpc86xx_hpcn.o obj-$(CONFIG_MPC8641_HPCN) += mpc86xx_hpcn.o
obj-$(CONFIG_SBC8641D) += sbc8641d.o obj-$(CONFIG_SBC8641D) += sbc8641d.o
obj-$(CONFIG_MPC8610_HPCD) += mpc8610_hpcd.o obj-$(CONFIG_MPC8610_HPCD) += mpc8610_hpcd.o
gef-gpio-$(CONFIG_GPIOLIB) += gef_gpio.o obj-$(CONFIG_GE_FPGA) += gef_pic.o
obj-$(CONFIG_GE_FPGA) += gef_pic.o $(gef-gpio-y)
obj-$(CONFIG_GEF_SBC610) += gef_sbc610.o obj-$(CONFIG_GEF_SBC610) += gef_sbc610.o
obj-$(CONFIG_GEF_SBC310) += gef_sbc310.o obj-$(CONFIG_GEF_SBC310) += gef_sbc310.o
obj-$(CONFIG_GEF_PPC9A) += gef_ppc9a.o obj-$(CONFIG_GEF_PPC9A) += gef_ppc9a.o
...@@ -190,6 +190,17 @@ config GPIO_VX855 ...@@ -190,6 +190,17 @@ config GPIO_VX855
additional drivers must be enabled in order to use the additional drivers must be enabled in order to use the
functionality of the device. functionality of the device.
config GPIO_GE_FPGA
bool "GE FPGA based GPIO"
depends on GE_FPGA
help
Support for common GPIO functionality provided on some GE Single Board
Computers.
This driver provides basic support (configure as input or output, read
and write pin state) for GPIO implemented in a number of GE single
board computers.
comment "I2C GPIO expanders:" comment "I2C GPIO expanders:"
config GPIO_MAX7300 config GPIO_MAX7300
......
...@@ -16,6 +16,7 @@ obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o ...@@ -16,6 +16,7 @@ obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o
obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o
obj-$(CONFIG_ARCH_DAVINCI) += gpio-davinci.o obj-$(CONFIG_ARCH_DAVINCI) += gpio-davinci.o
obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o
obj-$(CONFIG_GPIO_GE_FPGA) += gpio-ge.o
obj-$(CONFIG_GPIO_IT8761E) += gpio-it8761e.o obj-$(CONFIG_GPIO_IT8761E) += gpio-it8761e.o
obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o
obj-$(CONFIG_ARCH_KS8695) += gpio-ks8695.o obj-$(CONFIG_ARCH_KS8695) += gpio-ks8695.o
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* *
* Configuration of output modes (totem-pole/open-drain) * Configuration of output modes (totem-pole/open-drain)
* Interrupt configuration - interrupts are always generated the FPGA relies on * Interrupt configuration - interrupts are always generated the FPGA relies on
* the I/O interrupt controllers mask to stop them propergating * the I/O interrupt controllers mask to stop them propergating
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment