From 8822964292323cee1f9a468ec56a2567f417f034 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Mon, 6 Jun 2011 00:07:54 +0800 Subject: [PATCH] --- yaml --- r: 256677 b: refs/heads/master c: d37a65bb4663bde7cf3dbc51aec7f264fa4d0ebf h: refs/heads/master i: 256675: 87d908cb3d61722e1b672069f1e5389d1dad21da v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/Makefile | 2 +- trunk/drivers/gpio/Kconfig | 4 ++++ trunk/drivers/gpio/Makefile | 1 + trunk/{arch/arm/plat-mxc/gpio.c => drivers/gpio/gpio-mxc.c} | 0 5 files changed, 7 insertions(+), 2 deletions(-) rename trunk/{arch/arm/plat-mxc/gpio.c => drivers/gpio/gpio-mxc.c} (100%) diff --git a/[refs] b/[refs] index 8156809778b8..cb33db5c8d58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d7cf8370d5fb75a3265408dceb1d6173eebfafd +refs/heads/master: d37a65bb4663bde7cf3dbc51aec7f264fa4d0ebf diff --git a/trunk/arch/arm/plat-mxc/Makefile b/trunk/arch/arm/plat-mxc/Makefile index a1387875a491..d53c35fe2ea7 100644 --- a/trunk/arch/arm/plat-mxc/Makefile +++ b/trunk/arch/arm/plat-mxc/Makefile @@ -3,7 +3,7 @@ # # Common support -obj-y := clock.o gpio.o time.o devices.o cpu.o system.o irq-common.o +obj-y := clock.o time.o devices.o cpu.o system.o irq-common.o # MX51 uses the TZIC interrupt controller, older platforms use AVIC obj-$(CONFIG_MXC_TZIC) += tzic.o diff --git a/trunk/drivers/gpio/Kconfig b/trunk/drivers/gpio/Kconfig index 48711749ffcf..1ee725aa021d 100644 --- a/trunk/drivers/gpio/Kconfig +++ b/trunk/drivers/gpio/Kconfig @@ -97,6 +97,10 @@ config GPIO_MXS def_bool y depends on ARCH_MXS +config GPIO_MXC + def_bool y + depends on ARCH_MXC + config GPIO_PLAT_SAMSUNG bool "Samsung SoCs GPIO library support" default y if SAMSUNG_GPIOLIB_4BIT diff --git a/trunk/drivers/gpio/Makefile b/trunk/drivers/gpio/Makefile index f879cbe493d5..9c37339a57a7 100644 --- a/trunk/drivers/gpio/Makefile +++ b/trunk/drivers/gpio/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_GPIO_ADP5588) += adp5588-gpio.o obj-$(CONFIG_GPIO_BASIC_MMIO_CORE) += basic_mmio_gpio.o obj-$(CONFIG_GPIO_BASIC_MMIO) += basic_mmio_gpio.o obj-$(CONFIG_GPIO_EXYNOS4) += gpio-exynos4.o +obj-$(CONFIG_GPIO_MXC) += gpio-mxc.o obj-$(CONFIG_GPIO_MXS) += gpio-mxs.o obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o obj-$(CONFIG_GPIO_S5PC100) += gpio-s5pc100.o diff --git a/trunk/arch/arm/plat-mxc/gpio.c b/trunk/drivers/gpio/gpio-mxc.c similarity index 100% rename from trunk/arch/arm/plat-mxc/gpio.c rename to trunk/drivers/gpio/gpio-mxc.c