Merge branch 'gta02-machine-2.6.32' into gta02-machine-devices-2.6.32

Conflicts:

	arch/arm/mach-s3c2442/include/mach/gta02.h
	arch/arm/mach-s3c2442/mach-gta02.c

4 files changed, 75 insertions, 6 deletions

diff --git a/arch/arm/mach-s3c2442/gta02-pm-bt.c b/arch/arm/mach-s3c2442/gta02-pm-bt.c
index 76671ce96d0..8bb2a12f7c5 100644
--- a/arch/arm/mach-s3c2442/gta02-pm-bt.c
+++ b/arch/arm/mach-s3c2442/gta02-pm-bt.c
@@ -23,7 +23,6 @@
 #include <asm/mach-types.h>
 
 #include <mach/gta02.h>
-#include <linux/mfd/pcf50633/gpio.h>
 
 #include <linux/regulator/consumer.h>
 
diff --git a/arch/arm/mach-s3c2442/gta02-pm-gsm.c b/arch/arm/mach-s3c2442/gta02-pm-gsm.c
index 4b6cad806fe..70a94cb3f24 100644
--- a/arch/arm/mach-s3c2442/gta02-pm-gsm.c
+++ b/arch/arm/mach-s3c2442/gta02-pm-gsm.c
@@ -19,6 +19,8 @@
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/regulator/consumer.h>
 
 #include <mach/gpio.h>
 #include <asm/mach-types.h>
@@ -26,7 +28,6 @@
 #include <mach/hardware.h>
 
 #include <mach/gta02.h>
-#include <linux/mfd/pcf50633/gpio.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-gpioj.h>
 
@@ -38,6 +39,7 @@ extern void s3c24xx_serial_console_set_silence(int);
 struct gta02pm_priv {
 	int gpio_ndl_gsm;
 	struct console *con;
+	struct regulator *regulator;
 };
 
 static struct gta02pm_priv gta02_gsm;
@@ -62,7 +64,7 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
 			char *buf)
 {
 	if (!strcmp(attr->attr.name, "power_on")) {
-		if (pcf50633_gpio_get(gta02_pcf, PCF50633_GPIO2))
+		if (regulator_is_enabled(gta02_gsm.regulator))
 			goto out_1;
 	} else if (!strcmp(attr->attr.name, "download")) {
 		if (!s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM))
@@ -79,11 +81,17 @@ out_1:
 
 static void gsm_on_off(struct device *dev, int on)
 {
+
+	on = !!on;
+
+	if (on == regulator_is_enabled(gta02_gsm.regulator))
+		return;
+
 	if (!on) {
 		s3c2410_gpio_cfgpin(S3C2410_GPH(1), S3C2410_GPIO_INPUT);
 		s3c2410_gpio_cfgpin(S3C2410_GPH(2), S3C2410_GPIO_INPUT);
 
-		pcf50633_gpio_set(gta02_pcf, PCF50633_GPIO2, 0);
+		regulator_disable(gta02_gsm.regulator);
 
 		if (gta02_gsm.con) {
 			s3c24xx_serial_console_set_silence(0);
@@ -108,7 +116,7 @@ static void gsm_on_off(struct device *dev, int on)
 	s3c2410_gpio_cfgpin(S3C2410_GPH(1), S3C2410_GPH1_nRTS0);
 	s3c2410_gpio_cfgpin(S3C2410_GPH(2), S3C2410_GPH2_TXD0);
 
-	pcf50633_gpio_set(gta02_pcf, PCF50633_GPIO2, 7);
+	regulator_enable(gta02_gsm.regulator);
 
 	msleep(100);
 
@@ -264,6 +272,14 @@ static int __init gta02_gsm_probe(struct platform_device *pdev)
 	gta02_gsm.gpio_ndl_gsm = 1;
 	s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
 
+	gta02_gsm.regulator = regulator_get_exclusive(&pdev->dev, "GSM");
+
+	if (IS_ERR(gta02_gsm.regulator)) {
+		dev_err(&pdev->dev, "Failed to get regulator: %d\n",
+		PTR_ERR(gta02_gsm.regulator));
+		return PTR_ERR(gta02_gsm.regulator);
+	}
+
 	/* GSM is to be initially off (at boot, or if this module inserted) */
 	gsm_on_off(&pdev->dev, 0);
 
diff --git a/arch/arm/mach-s3c2442/include/mach/gta02.h b/arch/arm/mach-s3c2442/include/mach/gta02.h
index b67e5ec2919..6db48d4ff61 100644
--- a/arch/arm/mach-s3c2442/include/mach/gta02.h
+++ b/arch/arm/mach-s3c2442/include/mach/gta02.h
@@ -83,6 +83,9 @@
 #define GTA02_GPIO_GLAMO_BASE S3C_GPIO_END
 #define GTA02_GPIO_GLAMO(x) (GTA02_GPIO_GLAMO_BASE + (x))
 
+#define GTA02_GPIO_PCF_BASE (GTA02_GPIO_GLAMO_BASE + 32)
+#define GTA02_GPIO_PCF(x) (GTA02_GPIO_PCF_BASE + (x))
+
 int gta02_get_pcb_revision(void);
 
 extern struct pcf50633 *gta02_pcf;
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index 575064988da..74bd5564ec8 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -313,6 +313,39 @@ static struct platform_device gta02_pm_wlan_dev = {
 	.name = "gta02-pm-wlan",
 };
 
+static struct regulator_consumer_supply gsm_supply_consumer = {
+	.dev = &gta02_pm_gsm_dev.dev,
+	.supply = "GSM",
+};
+
+static struct regulator_init_data gsm_supply_init_data = {
+	.constraints = {
+		.min_uV = 3700000,
+		.max_uV = 3700000,
+		.valid_modes_mask = REGULATOR_MODE_NORMAL,
+		.valid_ops_mask = REGULATOR_CHANGE_STATUS,
+	},
+	.num_consumer_supplies = 1,
+	.consumer_supplies = &gsm_supply_consumer,
+};
+
+static struct fixed_voltage_config gsm_supply_config = {
+	.supply_name = "GSM",
+	.microvolts = 3700000,
+	.gpio = GTA02_GPIO_PCF(PCF50633_GPIO2),
+	.enable_high = 1,
+	.init_data = &gsm_supply_init_data,
+};
+
+static struct platform_device gta02_gsm_supply_device = {
+	.name = "reg-fixed-voltage",
+	.id = 1,
+	.dev = {
+		.platform_data = &gsm_supply_config,
+	},
+};
+
+
 #ifdef CONFIG_CHARGER_PCF50633
 /*
  * On GTA02 the 1A charger features a 48K resistor to 0V on the ID pin.
@@ -351,7 +384,7 @@ gta02_configure_pmu_for_charger(struct pcf50633 *pcf, void *unused, int res)
 		 * Sanity - stop GPO driving out now that we have a 1A charger
 		 * GPO controls USB Host power generation on GTA02
 		 */
-		pcf50633_gpio_set(pcf, PCF50633_GPO, 0);
+		/*pcf50633_gpio_set(pcf, PCF50633_GPO, 0);*/
 
 		ma = 1000;
 	} else
@@ -1132,6 +1165,14 @@ static struct platform_device* gta02_glamo_gpio_children[] = {
 	&spigpio_device,
 };
 
+static struct platform_device* gta02_pcf50633_gpio_children[] = {
+	&gta02_gsm_supply_device,
+};
+
+static struct platform_device* gta02_gsm_supply_children[] = {
+	&gta02_pm_gsm_dev,
+};
+
 static struct platform_device* gta02_hdq_children[] = {
 	&bq27000_battery_device,
 };
@@ -1151,6 +1192,16 @@ static struct gta02_device_children gta02_device_children[] = {
 		.dev_name = "spi2.0",
 		.probed_callback = gta02_jbt6k74_probe_completed,
 	},
+	{
+		.dev_name = "pcf50633-gpio",
+		.num_children = 1,
+		.children = gta02_pcf50633_gpio_children,
+	},
+	{
+		.dev_name = "reg-fixed-voltage.1",
+		.num_children = 1,
+		.children = gta02_gsm_supply_children,
+	}
 };
 
 static int gta02_add_child_devices(struct device *parent,