Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 880cf071 authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Introduce GPIO_SAMSUNG Kconfig entry 



This patch adds Kconfig entry that selects whether legacy Samsung GPIO
driver should be built or not. For platforms that support only DT based
boot, the new pinctrl driver is used and so the old one is not needed.

Cc: Grant Likely <grant.likely@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 8eaa9e42

arch/arm/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -695,6 +695,7 @@ config ARCH_S3C24XX 
	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -718,6 +719,7 @@ config ARCH_S3C64XX 
	select CLKSRC_MMIO

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -741,6 +743,7 @@ config ARCH_S5P64X0 
	select CLKSRC_MMIO

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -758,6 +761,7 @@ config ARCH_S5PC100 
	select CLKSRC_MMIO

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -776,6 +780,7 @@ config ARCH_S5PV210 
	select CLKSRC_MMIO

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -795,6 +800,7 @@ config ARCH_EXYNOS 
	select COMMON_CLK

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

arch/arm/plat-samsung/include/plat/pm.h

+5 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ extern void s3c_pm_check_store(void); 
 */

extern void s3c_pm_configure_extint(void);



#ifdef CONFIG_GPIO_SAMSUNG

/**

 * samsung_pm_restore_gpios() - restore the state of the gpios after sleep.

 *
@@ -181,6 +182,10 @@ extern void samsung_pm_restore_gpios(void); 
 * Save the GPIO states for resotration on resume. See samsung_pm_restore_gpios().

 */

extern void samsung_pm_save_gpios(void);

#else

static inline void samsung_pm_restore_gpios(void) {}

static inline void samsung_pm_save_gpios(void) {}

#endif



extern void s3c_pm_save_core(void);

extern void s3c_pm_restore_core(void);

drivers/gpio/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -209,6 +209,13 @@ config GPIO_RCAR 
	help

	  Say yes here to support GPIO on Renesas R-Car SoCs.



config GPIO_SAMSUNG

	bool

	depends on PLAT_SAMSUNG

	help

	  Legacy GPIO support. Use only for platforms without support for

	  pinctrl.



config GPIO_SPEAR_SPICS

	bool "ST SPEAr13xx SPI Chip Select as GPIO support"

	depends on PLAT_SPEAR

drivers/gpio/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o 
obj-$(CONFIG_GPIO_RC5T583)	+= gpio-rc5t583.o

obj-$(CONFIG_GPIO_RDC321X)	+= gpio-rdc321x.o

obj-$(CONFIG_GPIO_RCAR)		+= gpio-rcar.o

obj-$(CONFIG_PLAT_SAMSUNG)	+= gpio-samsung.o

obj-$(CONFIG_GPIO_SAMSUNG)	+= gpio-samsung.o

obj-$(CONFIG_ARCH_SA1100)	+= gpio-sa1100.o

obj-$(CONFIG_GPIO_SCH)		+= gpio-sch.o

obj-$(CONFIG_GPIO_SODAVILLE)	+= gpio-sodaville.o