diff options
| author | Kyungmin Park <kyungmin.park@samsung.com> | 2011-05-23 04:27:38 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-05-26 19:31:22 -0400 |
| commit | fed6a0224714bd414bff91833e0bd5775a3e9c66 (patch) | |
| tree | 24019b4f2b596c802167cb4484186e20a545e206 | |
| parent | bc6f5cf6484a509cfe0533b8ddf8b8ca60f35557 (diff) | |
gpio: Move to Samsung common GPIO library to drivers/gpio
It's common gpiolib for recent Samsung SoCs. Move to drivers/gpio
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -rw-r--r-- | arch/arm/plat-samsung/Makefile | 1 | ||||
| -rw-r--r-- | drivers/gpio/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/gpio/Makefile | 1 | ||||
| -rw-r--r-- | drivers/gpio/gpio-plat-samsung.c (renamed from arch/arm/plat-samsung/gpiolib.c) | 0 |
4 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index e9de58a2e29..53eb15b0a07 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile | |||
| @@ -19,7 +19,6 @@ obj-y += gpio.o | |||
| 19 | obj-y += gpio-config.o | 19 | obj-y += gpio-config.o |
| 20 | obj-y += dev-asocdma.o | 20 | obj-y += dev-asocdma.o |
| 21 | 21 | ||
| 22 | obj-$(CONFIG_SAMSUNG_GPIOLIB_4BIT) += gpiolib.o | ||
| 23 | obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o | 22 | obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o |
| 24 | 23 | ||
| 25 | obj-$(CONFIG_SAMSUNG_IRQ_UART) += irq-uart.o | 24 | obj-$(CONFIG_SAMSUNG_IRQ_UART) += irq-uart.o |
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index ebd1124b076..3735c051074 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig | |||
| @@ -86,6 +86,12 @@ config GPIO_IT8761E | |||
| 86 | help | 86 | help |
| 87 | Say yes here to support GPIO functionality of IT8761E super I/O chip. | 87 | Say yes here to support GPIO functionality of IT8761E super I/O chip. |
| 88 | 88 | ||
| 89 | config GPIO_PLAT_SAMSUNG | ||
| 90 | bool "Samsung SoCs GPIO library support" | ||
| 91 | default y if SAMSUNG_GPIOLIB_4BIT | ||
| 92 | help | ||
| 93 | Say yes here to support Samsung SoCs GPIO library | ||
| 94 | |||
| 89 | config GPIO_PL061 | 95 | config GPIO_PL061 |
| 90 | bool "PrimeCell PL061 GPIO support" | 96 | bool "PrimeCell PL061 GPIO support" |
| 91 | depends on ARM_AMBA | 97 | depends on ARM_AMBA |
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 7481e7da2ad..426483f60d6 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile | |||
| @@ -8,6 +8,7 @@ obj-$(CONFIG_GPIO_ADP5520) += adp5520-gpio.o | |||
| 8 | obj-$(CONFIG_GPIO_ADP5588) += adp5588-gpio.o | 8 | 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_PLAT_SAMSUNG) += gpio-plat-samsung.o | ||
| 11 | obj-$(CONFIG_GPIO_LANGWELL) += langwell_gpio.o | 12 | obj-$(CONFIG_GPIO_LANGWELL) += langwell_gpio.o |
| 12 | obj-$(CONFIG_GPIO_MAX730X) += max730x.o | 13 | obj-$(CONFIG_GPIO_MAX730X) += max730x.o |
| 13 | obj-$(CONFIG_GPIO_MAX7300) += max7300.o | 14 | obj-$(CONFIG_GPIO_MAX7300) += max7300.o |
diff --git a/arch/arm/plat-samsung/gpiolib.c b/drivers/gpio/gpio-plat-samsung.c index ea37c046178..ea37c046178 100644 --- a/arch/arm/plat-samsung/gpiolib.c +++ b/drivers/gpio/gpio-plat-samsung.c | |||