diff options
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 2 | ||||
| -rw-r--r-- | drivers/gpio/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/gpio/Makefile | 1 | ||||
| -rw-r--r-- | drivers/gpio/gpio-imx.c (renamed from arch/arm/mach-imx/gpio.c) | 0 |
4 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index ff8f15b8c0..b703ed1dcd 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -1,4 +1,4 @@ -obj-y += clocksource.o gpio.o +obj-y += clocksource.o obj-$(CONFIG_ARCH_IMX1) += imx1.o iomux-v1.o clk-imx1.o obj-$(CONFIG_ARCH_IMX25) += imx25.o iomux-v3.o clk-imx25.o obj-$(CONFIG_ARCH_IMX21) += imx21.o iomux-v1.o clk-imx21.o diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index ea07028db5..74a4baa788 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -27,6 +27,9 @@ config GPIO_GENERIC_PLATFORM Say yes here to support basic platform memory-mapped GPIO controllers +config GPIO_IMX + def_bool ARCH_IMX + config GPIO_PL061 bool "PrimeCell PL061 GPIO support" depends on ARM_AMBA diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 6a94430ec0..205d5531bb 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -3,5 +3,6 @@ obj-$(CONFIG_GPIOLIB) += gpiolib.o obj-$(CONFIG_GPIO_BCM2835) += gpio-bcm2835.o obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o obj-$(CONFIG_GPIO_GENERIC) += gpio-generic.o +obj-$(CONFIG_GPIO_IMX) += gpio-imx.o obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o diff --git a/arch/arm/mach-imx/gpio.c b/drivers/gpio/gpio-imx.c index 1bf4100964..1bf4100964 100644 --- a/arch/arm/mach-imx/gpio.c +++ b/drivers/gpio/gpio-imx.c |