openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: SAMSUNG: Fix GPIO space reservation for S3C64xx platforms 

The conversion to use SAMSUNG_GPIO_EXTRA rather than S3C24XX_GPIO_EXTRA
broke a number of S3C64xx boards which had been using the symbols provided
to reserve a range of GPIOs for board specific use. Fix this by adding
equivalent symbols for the new shared driver and updating the relevant
boards to use the new symbols.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Mark Brown 2011-11-03 16:15:38 +09:00 committed by Kukjin Kim
parent b462c20e29
commit 4ff13995b5
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-s3c64xx/Kconfig
View File

@ -188,7 +188,7 @@ config SMDK6410_WM1190_EV1
depends on MACH_SMDK6410 depends on MACH_SMDK6410
select REGULATOR select REGULATOR
select REGULATOR_WM8350 select REGULATOR_WM8350
select S3C24XX_GPIO_EXTRA64 select SAMSUNG_GPIO_EXTRA64
select MFD_WM8350_I2C select MFD_WM8350_I2C
select MFD_WM8350_CONFIG_MODE_0 select MFD_WM8350_CONFIG_MODE_0
select MFD_WM8350_CONFIG_MODE_3 select MFD_WM8350_CONFIG_MODE_3
@ -206,7 +206,7 @@ config SMDK6410_WM1192_EV1
depends on MACH_SMDK6410 depends on MACH_SMDK6410
select REGULATOR select REGULATOR
select REGULATOR_WM831X select REGULATOR_WM831X
select S3C24XX_GPIO_EXTRA64 select SAMSUNG_GPIO_EXTRA64
select MFD_WM831X select MFD_WM831X
select MFD_WM831X_I2C select MFD_WM831X_I2C
help help
@ -287,7 +287,7 @@ config MACH_WLF_CRAGG_6410
select S3C_DEV_WDT select S3C_DEV_WDT
select S3C_DEV_RTC select S3C_DEV_RTC
select S3C64XX_DEV_SPI select S3C64XX_DEV_SPI
select S3C24XX_GPIO_EXTRA128 select SAMSUNG_GPIO_EXTRA128
select I2C select I2C
help help
Machine support for the Wolfson Cragganmore S3C6410 variant. Machine support for the Wolfson Cragganmore S3C6410 variant.

8
arch/arm/plat-samsung/Kconfig
View File

@ -88,12 +88,20 @@ config S5P_GPIO_DRVSTR
config SAMSUNG_GPIO_EXTRA config SAMSUNG_GPIO_EXTRA
int "Number of additional GPIO pins" int "Number of additional GPIO pins"
default 128 if SAMSUNG_GPIO_EXTRA128
default 64 if SAMSUNG_GPIO_EXTRA64
default 0 default 0
help help
Use additional GPIO space in addition to the GPIO's the SOC Use additional GPIO space in addition to the GPIO's the SOC
provides. This allows expanding the GPIO space for use with provides. This allows expanding the GPIO space for use with
GPIO expanders. GPIO expanders.
config SAMSUNG_GPIO_EXTRA64
bool
config SAMSUNG_GPIO_EXTRA128
bool
config S3C_GPIO_SPACE config S3C_GPIO_SPACE
int "Space between gpio banks" int "Space between gpio banks"
default 0 default 0