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

Commit d7b4e421 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge for-2637/s3c24xx/misc

parents 7c1552d1 bdf5005b

arch/arm/mach-s3c2440/Kconfig

+2 −5
Original line number Diff line number Diff line
@@ -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

arch/arm/plat-s3c24xx/gpiolib.c

+2 −0
Original line number Diff line number Diff line
@@ -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[] = {