diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2011-06-05 12:07:54 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-06 12:01:19 -0400 |
| commit | d37a65bb4663bde7cf3dbc51aec7f264fa4d0ebf (patch) | |
| tree | 5cea55304a0c2863273299209c7edd6518617377 | |
| parent | 8d7cf8370d5fb75a3265408dceb1d6173eebfafd (diff) | |
gpio/mxc: Move Freescale MXC gpio driver to drivers/gpio
GPIO drivers are getting moved to drivers/gpio for cleanup and
consolidation. This patch moves the plat-mxc driver. Follow up
patches will clean it up and make it a fine upstanding gpio driver.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -rw-r--r-- | arch/arm/plat-mxc/Makefile | 2 | ||||
| -rw-r--r-- | drivers/gpio/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/gpio/Makefile | 1 | ||||
| -rw-r--r-- | drivers/gpio/gpio-mxc.c (renamed from arch/arm/plat-mxc/gpio.c) | 0 |
4 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile index a1387875a491..d53c35fe2ea7 100644 --- a/arch/arm/plat-mxc/Makefile +++ b/arch/arm/plat-mxc/Makefile | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | # Common support | 5 | # Common support |
| 6 | obj-y := clock.o gpio.o time.o devices.o cpu.o system.o irq-common.o | 6 | obj-y := clock.o time.o devices.o cpu.o system.o irq-common.o |
| 7 | 7 | ||
| 8 | # MX51 uses the TZIC interrupt controller, older platforms use AVIC | 8 | # MX51 uses the TZIC interrupt controller, older platforms use AVIC |
| 9 | obj-$(CONFIG_MXC_TZIC) += tzic.o | 9 | obj-$(CONFIG_MXC_TZIC) += tzic.o |
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 48711749ffcf..1ee725aa021d 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig | |||
| @@ -97,6 +97,10 @@ config GPIO_MXS | |||
| 97 | def_bool y | 97 | def_bool y |
| 98 | depends on ARCH_MXS | 98 | depends on ARCH_MXS |
| 99 | 99 | ||
| 100 | config GPIO_MXC | ||
| 101 | def_bool y | ||
| 102 | depends on ARCH_MXC | ||
| 103 | |||
| 100 | config GPIO_PLAT_SAMSUNG | 104 | config GPIO_PLAT_SAMSUNG |
| 101 | bool "Samsung SoCs GPIO library support" | 105 | bool "Samsung SoCs GPIO library support" |
| 102 | default y if SAMSUNG_GPIOLIB_4BIT | 106 | default y if SAMSUNG_GPIOLIB_4BIT |
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index f879cbe493d5..9c37339a57a7 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile | |||
| @@ -9,6 +9,7 @@ obj-$(CONFIG_GPIO_ADP5588) += adp5588-gpio.o | |||
| 9 | obj-$(CONFIG_GPIO_BASIC_MMIO_CORE) += basic_mmio_gpio.o | 9 | obj-$(CONFIG_GPIO_BASIC_MMIO_CORE) += basic_mmio_gpio.o |
| 10 | obj-$(CONFIG_GPIO_BASIC_MMIO) += basic_mmio_gpio.o | 10 | obj-$(CONFIG_GPIO_BASIC_MMIO) += basic_mmio_gpio.o |
| 11 | obj-$(CONFIG_GPIO_EXYNOS4) += gpio-exynos4.o | 11 | obj-$(CONFIG_GPIO_EXYNOS4) += gpio-exynos4.o |
| 12 | obj-$(CONFIG_GPIO_MXC) += gpio-mxc.o | ||
| 12 | obj-$(CONFIG_GPIO_MXS) += gpio-mxs.o | 13 | obj-$(CONFIG_GPIO_MXS) += gpio-mxs.o |
| 13 | obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o | 14 | obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o |
| 14 | obj-$(CONFIG_GPIO_S5PC100) += gpio-s5pc100.o | 15 | obj-$(CONFIG_GPIO_S5PC100) += gpio-s5pc100.o |
diff --git a/arch/arm/plat-mxc/gpio.c b/drivers/gpio/gpio-mxc.c index 6cd6d7f686f6..6cd6d7f686f6 100644 --- a/arch/arm/plat-mxc/gpio.c +++ b/drivers/gpio/gpio-mxc.c | |||