gpio: samsung: move gpio-samsung driver back to platform code (0f20e456) · Commits · 戴 / test

The gpio-samsung driver is special in the sense that it interacts directly in multiple ways with the legacy platform code for the s3c24xx and s3c64xx platforms. In contrast, all devicetree based machines for Samsung, including the ones on those two SoC families use a different driver. The header files that define the interface between the platform code and the gpio driver are not visible when building a kernel for ARCH_MULTIPLATFORM, which prevents us from turning on this option for s3c64xx. To work around this, we now move the driver back into platform code, from where it was originally moved to as part of commit ("gpio/samsung: gpio-samsung.c to support Samsung GPIOs"). The long-term plan for this driver would be to remove it entirely, after all Samsung machines have been converted over to boot from DT, but there is currently no timeline for when that might happen. Signed-off-by:

Arnd Bergmann <arnd@arndb.de> Reviewed-by:

Krzysztof Kozlowski <k.kozlowski@samsung.com>

arch/arm/plat-samsung/Kconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -225,6 +225,9 @@ config S3C24XX_PWM
		Support for exporting the PWM timer blocks via the pwm device
		system

		config GPIO_SAMSUNG
		def_bool y

		config SAMSUNG_PM_GPIO
		bool
		default y if GPIO_SAMSUNG && PM

arch/arm/plat-samsung/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ obj-$(CONFIG_SAMSUNG_ATAGS) += platformdata.o
		obj-$(CONFIG_SAMSUNG_ATAGS) += devs.o
		obj-$(CONFIG_SAMSUNG_ATAGS) += dev-uart.o

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

		# PM support

		obj-$(CONFIG_PM_SLEEP) += pm-common.o

drivers/gpio/gpio-samsung.c→arch/arm/plat-samsung/gpio-samsung.c

+0 −0

File moved.

View file

drivers/gpio/Kconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -344,13 +344,6 @@ 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

+0 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,6 @@ 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_GPIO_SAMSUNG) += gpio-samsung.o
		obj-$(CONFIG_ARCH_SA1100) += gpio-sa1100.o
		obj-$(CONFIG_GPIO_SCH) += gpio-sch.o
		obj-$(CONFIG_GPIO_SCH311X) += gpio-sch311x.o

Admin message