]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ARM: Merge for-2635-4/ts-machines
authorBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 09:51:59 +0000 (18:51 +0900)
committerBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 09:51:59 +0000 (18:51 +0900)
Merge branch 'for-2635-4/ts-machines' into for-2635-4/partial1

arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/mach-s5p6440/Kconfig
arch/arm/mach-s5p6440/cpu.c
arch/arm/mach-s5p6440/include/mach/map.h
arch/arm/mach-s5p6440/mach-smdk6440.c
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/cpu.c
arch/arm/mach-s5pv210/include/mach/map.h
arch/arm/mach-s5pv210/mach-smdkv210.c

index 69e9fbfea9175a7e09b5e86c500a9e47ebd82d8c..1f2f412b02007067a03f93525a7cc60d0136640b 100644 (file)
@@ -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
index 9d51455feb31ac2d3383aff8af77cebd20b2743f..d0c6e9bdc68652adf2eb85142c8000b75d52e72c 100644 (file)
@@ -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) &
index 77aeffd17330614e439524fd73d59fbfd7820996..ef00cb716cba8aa73afd02406bf5e5737d19296d 100644 (file)
@@ -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
 
index ca3b3206e6f86d999d789fc05947a44bd38be314..b2fe6a58155a66915dc745402f8221ebf3b7fd0f 100644 (file)
@@ -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)
index 72aedadd412cd405747725993054c554dff03fe8..13c1ee718d30de205b8cab7fd4b735eb0b2a8004 100644 (file)
 /* 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 */
index d7fede971ca6cc5c65abd2951020571803284730..f9948174ba4eaf54712240e93f45c619ebe8da72 100644 (file)
@@ -38,6 +38,8 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pll.h>
+#include <plat/adc.h>
+#include <plat/ts.h>
 
 #define S5P6440_UCON_DEFAULT    (S3C2410_UCON_TXILEVEL |       \
                                S3C2410_UCON_RXILEVEL |         \
@@ -85,6 +87,14 @@ static struct s3c2410_uartcfg smdk6440_uartcfgs[] __initdata = {
 
 static struct platform_device *smdk6440_devices[] __initdata = {
        &s5p6440_device_iis,
+       &s3c_device_adc,
+       &s3c_device_ts,
+};
+
+static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
+       .delay                  = 10000,
+       .presc                  = 49,
+       .oversampling_shift     = 2,
 };
 
 static void __init smdk6440_map_io(void)
@@ -96,6 +106,8 @@ static void __init smdk6440_map_io(void)
 
 static void __init smdk6440_machine_init(void)
 {
+       s3c24xx_ts_set_platdata(&s3c_ts_platform);
+
        platform_add_devices(smdk6440_devices, ARRAY_SIZE(smdk6440_devices));
 }
 
index 8b9566e0cc514f56f7f6b30e6f8232763e93f676..5649733bf815dff511f3a652d14dbe21259ac6d9 100644 (file)
@@ -26,6 +26,8 @@ config MACH_SMDKV210
        bool "SMDKV210"
        select CPU_S5PV210
        select ARCH_SPARSEMEM_ENABLE
+       select SAMSUNG_DEV_ADC
+       select SAMSUNG_DEV_TS
        help
          Machine support for Samsung SMDKV210
 
index 2b776eb5d150367dea5a20ffae96c6a6c516e354..359bdc8f3b664a1768f899e5c39c74ce37b79463 100644 (file)
@@ -74,6 +74,8 @@ static void s5pv210_idle(void)
 
 void __init s5pv210_map_io(void)
 {
+       s3c_device_adc.name     = "s3c64xx-adc";
+
        iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));
 }
 
index 5adcb9f26e449ef76504b10244cbd3570fb710dc..e8595708305558cad146f4c4bbd05139537c3acd 100644 (file)
 /* AC97 */
 #define S5PV210_PA_AC97                0xE2200000
 
+#define S5PV210_PA_ADC         (0xE1700000)
+
 /* compatibiltiy defines. */
 #define S3C_PA_UART            S5PV210_PA_UART
 #define S3C_PA_IIC             S5PV210_PA_IIC0
+#define SAMSUNG_PA_ADC         S5PV210_PA_ADC
 
 #endif /* __ASM_ARCH_MAP_H */
index 3c29e18528a5f3df6067e33b39b8506829f5fa56..b92beb6831aeae00671197ac410e8f4fcd82adbc 100644 (file)
@@ -25,6 +25,8 @@
 #include <plat/s5pv210.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
+#include <plat/adc.h>
+#include <plat/ts.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define S5PV210_UCON_DEFAULT   (S3C2410_UCON_TXILEVEL |        \
@@ -74,6 +76,14 @@ static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = {
 static struct platform_device *smdkv210_devices[] __initdata = {
        &s5pv210_device_iis0,
        &s5pv210_device_ac97,
+       &s3c_device_adc,
+       &s3c_device_ts,
+};
+
+static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
+       .delay                  = 10000,
+       .presc                  = 49,
+       .oversampling_shift     = 2,
 };
 
 static void __init smdkv210_map_io(void)
@@ -85,6 +95,7 @@ static void __init smdkv210_map_io(void)
 
 static void __init smdkv210_machine_init(void)
 {
+       s3c24xx_ts_set_platdata(&s3c_ts_platform);
        platform_add_devices(smdkv210_devices, ARRAY_SIZE(smdkv210_devices));
 }