diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-10-30 00:46:55 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-10-30 00:46:55 +0100 |
| commit | d7b4e421a5be88f2f5b3cfe9aec638d90c62bc0f (patch) | |
| tree | d18aa2e45a3175cd65c7d552cb94e50ff46cd7a4 /arch | |
| parent | 7c1552d196682f05abaa8e49f81c40a9b6459b67 (diff) | |
| parent | bdf5005b738c1542a30b41a83069329313fc61f6 (diff) | |
| download | linux-3.10-d7b4e421a5be88f2f5b3cfe9aec638d90c62bc0f.tar.gz linux-3.10-d7b4e421a5be88f2f5b3cfe9aec638d90c62bc0f.tar.bz2 linux-3.10-d7b4e421a5be88f2f5b3cfe9aec638d90c62bc0f.zip | |
ARM: Merge for-2637/s3c24xx/misc
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 7 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/gpiolib.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index cd8e7de388f..ff024a6c0f8 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig @@ -4,7 +4,6 @@ config CPU_S3C2440 bool - depends on ARCH_S3C2410 select CPU_ARM920T select S3C_GPIO_PULL_UP select S3C2410_CLOCK @@ -18,7 +17,6 @@ config CPU_S3C2440 config CPU_S3C2442 bool - depends on ARCH_S3C2410 select CPU_ARM920T select S3C2410_CLOCK select S3C2410_GPIO @@ -30,7 +28,7 @@ config CPU_S3C2442 config CPU_S3C244X bool - depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442) + depends on CPU_S3C2440 || CPU_S3C2442 help Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems. @@ -72,7 +70,7 @@ config S3C2440_PLL_16934400 config S3C2440_DMA bool - depends on ARCH_S3C2410 && CPU_S3C24405B + depends on CPU_S3C2440 help Support for S3C2440 specific DMA code5A @@ -181,7 +179,6 @@ config MACH_MINI2440 select CPU_S3C2440 select EEPROM_AT24 select LEDS_TRIGGER_BACKLIGHT - select SND_S3C24XX_SOC_S3C24XX_UDA134X select S3C_DEV_NAND select S3C_DEV_USB_HOST help diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c index 4c0896f2572..ae9d3c2403f 100644 --- a/arch/arm/plat-s3c24xx/gpiolib.c +++ b/arch/arm/plat-s3c24xx/gpiolib.c @@ -87,6 +87,8 @@ static struct s3c_gpio_cfg s3c24xx_gpiocfg_banka = { struct s3c_gpio_cfg s3c24xx_gpiocfg_default = { .set_config = s3c_gpio_setcfg_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[] = { |