lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: Merge for-2637/s3c24xx/misc

Browse Source
This commit is contained in:
Ben Dooks
2010-10-30 00:46:55 +01:00
parent 7c1552d196 bdf5005b73
commit d7b4e421a5
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-s3c2440/Kconfig
View File

@@ -4,7 +4,6 @@
config CPU_S3C2440 config CPU_S3C2440
bool bool
depends on ARCH_S3C2410
select CPU_ARM920T select CPU_ARM920T
select S3C_GPIO_PULL_UP select S3C_GPIO_PULL_UP
select S3C2410_CLOCK select S3C2410_CLOCK
@@ -18,7 +17,6 @@ config CPU_S3C2440
config CPU_S3C2442 config CPU_S3C2442
bool bool
depends on ARCH_S3C2410
select CPU_ARM920T select CPU_ARM920T
select S3C2410_CLOCK select S3C2410_CLOCK
select S3C2410_GPIO select S3C2410_GPIO
@@ -30,7 +28,7 @@ config CPU_S3C2442
config CPU_S3C244X config CPU_S3C244X
bool bool
depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442) depends on CPU_S3C2440 || CPU_S3C2442
help help
Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems. Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems.
@@ -72,7 +70,7 @@ config S3C2440_PLL_16934400
config S3C2440_DMA config S3C2440_DMA
bool bool
depends on ARCH_S3C2410 && CPU_S3C24405B depends on CPU_S3C2440
help help
Support for S3C2440 specific DMA code5A Support for S3C2440 specific DMA code5A
@@ -181,7 +179,6 @@ config MACH_MINI2440
select CPU_S3C2440 select CPU_S3C2440
select EEPROM_AT24 select EEPROM_AT24
select LEDS_TRIGGER_BACKLIGHT select LEDS_TRIGGER_BACKLIGHT
select SND_S3C24XX_SOC_S3C24XX_UDA134X
select S3C_DEV_NAND select S3C_DEV_NAND
select S3C_DEV_USB_HOST select S3C_DEV_USB_HOST
help help

2
arch/arm/plat-s3c24xx/gpiolib.c
View File

@@ -87,6 +87,8 @@ static struct s3c_gpio_cfg s3c24xx_gpiocfg_banka = {
struct s3c_gpio_cfg s3c24xx_gpiocfg_default = { struct s3c_gpio_cfg s3c24xx_gpiocfg_default = {
.set_config = s3c_gpio_setcfg_s3c24xx, .set_config = s3c_gpio_setcfg_s3c24xx,
.get_config = s3c_gpio_getcfg_s3c24xx, .get_config = s3c_gpio_getcfg_s3c24xx,
.set_pull = s3c_gpio_setpull_1up,
.get_pull = s3c_gpio_getpull_1up,
}; };
struct s3c_gpio_chip s3c24xx_gpios[] = { struct s3c_gpio_chip s3c24xx_gpios[] = {