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

ARM: Merge for-2635-4/ts-machines 

Merge branch 'for-2635-4/ts-machines' into for-2635-4/partial1
parents d48562ab 41d8289d

arch/arm/mach-s3c64xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ config MACH_SMDK6410 
	select S3C_DEV_HSMMC1

	select S3C_DEV_I2C1

	select S3C_DEV_FB

	select SAMSUNG_DEV_TS

	select S3C_DEV_USB_HOST

	select S3C_DEV_USB_HSOTG

	select S3C64XX_SETUP_SDHCI

arch/arm/mach-s3c64xx/mach-smdk6410.c

+12 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ 
#include <plat/clock.h>

#include <plat/devs.h>

#include <plat/cpu.h>

#include <plat/adc.h>

#include <plat/ts.h>



#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK

#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
@@ -262,6 +264,8 @@ static struct platform_device *smdk6410_devices[] __initdata = { 
	&smdk6410_lcd_powerdev,



	&smdk6410_smsc911x,

	&s3c_device_adc,

	&s3c_device_ts,

};



#ifdef CONFIG_REGULATOR
@@ -596,6 +600,12 @@ static struct i2c_board_info i2c_devs1[] __initdata = { 
	{ I2C_BOARD_INFO("24c128", 0x57), },	/* Samsung S524AD0XD1 */

};



static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {

	.delay			= 10000,

	.presc			= 49,

	.oversampling_shift	= 2,

};



static void __init smdk6410_map_io(void)

{

	u32 tmp;
@@ -625,6 +635,8 @@ static void __init smdk6410_machine_init(void) 
	s3c_i2c1_set_platdata(NULL);

	s3c_fb_set_platdata(&smdk6410_lcd_pdata);



	s3c24xx_ts_set_platdata(&s3c_ts_platform);



	/* configure nCS1 width to 16 bits */



	cs1 = __raw_readl(S3C64XX_SROM_BW) &

arch/arm/mach-s5p6440/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ config CPU_S5P6440 
config MACH_SMDK6440

	bool "SMDK6440"

	select CPU_S5P6440

	select SAMSUNG_DEV_TS

	select SAMSUNG_DEV_ADC

	help

	  Machine support for the Samsung SMDK6440

arch/arm/mach-s5p6440/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ static void s5p6440_idle(void) 
void __init s5p6440_map_io(void)

{

	/* initialize any device information early */

	s3c_device_adc.name	= "s3c64xx-adc";

}



void __init s5p6440_init_clocks(int xtal)

arch/arm/mach-s5p6440/include/mach/map.h

+3 −0
Original line number Diff line number Diff line
@@ -69,8 +69,11 @@ 
/* PCM */

#define S5P6440_PA_PCM		0xF2100000



#define S5P6440_PA_ADC		(0xF3000000)



/* compatibiltiy defines. */

#define S3C_PA_UART		S5P6440_PA_UART

#define S3C_PA_IIC		S5P6440_PA_IIC0

#define SAMSUNG_PA_ADC		S5P6440_PA_ADC



#endif /* __ASM_ARCH_MAP_H */