Merge branch 'next-s3c2440-gta02' into for-next

1 files changed, 54 insertions, 17 deletions

diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index 9f2c14ec7181..d217ef3cd86a 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -58,6 +58,9 @@
 #include <linux/mfd/pcf50633/pmic.h>
 #include <linux/mfd/pcf50633/backlight.h>
 
+#include <linux/input.h>
+#include <linux/gpio_keys.h>
+
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
@@ -86,6 +89,8 @@
 #include <plat/udc.h>
 #include <plat/gpio-cfg.h>
 #include <plat/iic.h>
+#include <plat/ts.h>
+
 
 static struct pcf50633 *gta02_pcf;
 
@@ -280,9 +285,6 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
                                 .valid_modes_mask = REGULATOR_MODE_NORMAL,
                                 .always_on = 1,
                                 .apply_uV = 1,
-                                .state_mem = {
-                                        .enabled = 1,
-                                },
                         },
                 },
                 [PCF50633_REGULATOR_DOWN1] = {
@@ -301,9 +303,6 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
                                 .valid_modes_mask = REGULATOR_MODE_NORMAL,
                                 .apply_uV = 1,
                                 .always_on = 1,
-                                .state_mem = {
-                                        .enabled = 1,
-                                },
                         },
                 },
                 [PCF50633_REGULATOR_HCLDO] = {
@@ -311,8 +310,8 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
                                 .min_uV = 2000000,
                                 .max_uV = 3300000,
                                 .valid_modes_mask = REGULATOR_MODE_NORMAL,
-                                .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
-                                .always_on = 1,
+                                .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                                REGULATOR_CHANGE_STATUS,
                         },
                 },
                 [PCF50633_REGULATOR_LDO1] = {
@@ -320,10 +319,8 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
                                 .min_uV = 3300000,
                                 .max_uV = 3300000,
                                 .valid_modes_mask = REGULATOR_MODE_NORMAL,
+                                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
                                 .apply_uV = 1,
-                                .state_mem = {
-                                        .enabled = 0,
-                                },
                         },
                 },
                 [PCF50633_REGULATOR_LDO2] = {
@@ -347,6 +344,7 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
                                 .min_uV = 3200000,
                                 .max_uV = 3200000,
                                 .valid_modes_mask = REGULATOR_MODE_NORMAL,
+                                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
                                 .apply_uV = 1,
                         },
                 },
@@ -355,10 +353,8 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
                                 .min_uV = 3000000,
                                 .max_uV = 3000000,
                                 .valid_modes_mask = REGULATOR_MODE_NORMAL,
+                                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
                                 .apply_uV = 1,
-                                .state_mem = {
-                                        .enabled = 1,
-                                },
                         },
                 },
                 [PCF50633_REGULATOR_LDO6] = {
@@ -373,9 +369,6 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
                                 .min_uV = 1800000,
                                 .max_uV = 1800000,
                                 .valid_modes_mask = REGULATOR_MODE_NORMAL,
-                                .state_mem = {
-                                        .enabled = 1,
-                                },
                         },
                 },
 
@@ -489,6 +482,43 @@ static struct s3c2410_hcd_info gta02_usb_info __initdata = {
         },
 };
 
+/* Touchscreen */
+static struct s3c2410_ts_mach_info gta02_ts_info = {
+        .delay                  = 10000,
+        .presc                  = 0xff, /* slow as we can go */
+        .oversampling_shift     = 2,
+};
+
+/* Buttons */
+static struct gpio_keys_button gta02_buttons[] = {
+        {
+                .gpio = GTA02_GPIO_AUX_KEY,
+                .code = KEY_PHONE,
+                .desc = "Aux",
+                .type = EV_KEY,
+                .debounce_interval = 100,
+        },
+        {
+                .gpio = GTA02_GPIO_HOLD_KEY,
+                .code = KEY_PAUSE,
+                .desc = "Hold",
+                .type = EV_KEY,
+                .debounce_interval = 100,
+        },
+};
+
+static struct gpio_keys_platform_data gta02_buttons_pdata = {
+        .buttons = gta02_buttons,
+        .nbuttons = ARRAY_SIZE(gta02_buttons),
+};
+
+static struct platform_device gta02_buttons_device = {
+        .name = "gpio-keys",
+        .id = -1,
+        .dev = {
+                .platform_data = &gta02_buttons_pdata,
+        },
+};
 
 static void __init gta02_map_io(void)
 {
@@ -509,7 +539,11 @@ static struct platform_device *gta02_devices[] __initdata = {
         &gta02_nor_flash,
         &s3c24xx_pwm_device,
         &s3c_device_iis,
+        &samsung_asoc_dma,
         &s3c_device_i2c0,
+        &gta02_buttons_device,
+        &s3c_device_adc,
+        &s3c_device_ts,
 };
 
 /* These guys DO need to be children of PMU. */
@@ -559,6 +593,7 @@ static void __init gta02_machine_init(void)
 #endif
 
         s3c24xx_udc_set_platdata(&gta02_udc_cfg);
+        s3c24xx_ts_set_platdata(&gta02_ts_info);
         s3c_ohci_set_platdata(&gta02_usb_info);
         s3c_nand_set_platdata(&gta02_nand_info);
         s3c_i2c0_set_platdata(NULL);
@@ -567,6 +602,8 @@ static void __init gta02_machine_init(void)
 
         platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
         pm_power_off = gta02_poweroff;
+
+        regulator_has_full_constraints();
 }