eliminate_pcf50633_global.patch

Eliminate pcf50633_global and hence make pcf50633.c work with
multiple devices. pcf50633 is no longer a paltform device, but
an i2c device.

5 files changed, 15 insertions, 15 deletions

diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
index 8be584c9f82..dc149ac6d02 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
@@ -88,11 +88,11 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
 			if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN) == on)
 				return count;
 			neo1973_gpb_setpin(GTA02_GPIO_BT_EN, !on);
-			pcf50633_voltage_set(pcf50633_global,
+			pcf50633_voltage_set(gta02_pcf_pdata.pcf,
 				PCF50633_REGULATOR_LDO4, on ? 3200 : 0);
-			pcf50633_onoff_set(pcf50633_global,
+			pcf50633_onoff_set(gta02_pcf_pdata.pcf,
 				PCF50633_REGULATOR_LDO4, on);
-			vol = pcf50633_voltage_get(pcf50633_global,
+			vol = pcf50633_voltage_get(gta02_pcf_pdata.pcf,
 				PCF50633_REGULATOR_LDO4);
 			dev_info(dev, "GTA02 Set PCF50633 LDO4 = %d\n", vol);
 			neo1973_gpb_setpin(GTA02_GPIO_BT_EN, on);
@@ -158,7 +158,7 @@ static int __init gta01_bt_probe(struct platform_device *pdev)
 		neo1973_gpb_setpin(GTA01_GPIO_BT_EN, 0);
 	} else if (machine_is_neo1973_gta02()) {
 		/* we make sure that the voltage is off */
-		pcf50633_onoff_set(pcf50633_global,
+		pcf50633_onoff_set(gta02_pcf_pdata.pcf,
 				     PCF50633_REGULATOR_LDO4, 0);
 		/* we pull reset to low to make sure that the chip doesn't
 	 	 * drain power through the reset line */
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
index 6fabf19d0da..a3a6ad3b53f 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
@@ -280,7 +280,7 @@ static void gps_pwron_set(int on)
 
 	if (machine_is_neo1973_gta02()) {
 		if (on) {
-			pcf50633_voltage_set(pcf50633_global,
+			pcf50633_voltage_set(gta02_pcf_pdata.pcf,
 				PCF50633_REGULATOR_LDO5, 3000);
 			/* return UART pins to being UART pins */
 			s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_TXD1);
@@ -296,7 +296,7 @@ static void gps_pwron_set(int on)
 			/* don't let RX from unpowered GPS float */
 			s3c2410_gpio_pullup(S3C2410_GPH5, 1);
 		}
-		pcf50633_onoff_set(pcf50633_global,
+		pcf50633_onoff_set(gta02_pcf_pdata.pcf,
 			PCF50633_REGULATOR_LDO5, on);
 	}
 }
@@ -307,7 +307,7 @@ static int gps_pwron_get(void)
 		return !!s3c2410_gpio_getpin(GTA01_GPIO_GPS_PWRON);
 
 	if (machine_is_neo1973_gta02())
-		return !!pcf50633_onoff_get(pcf50633_global,
+		return !!pcf50633_onoff_get(gta02_pcf_pdata.pcf,
 						       PCF50633_REGULATOR_LDO5);
 	return -1;
 }
@@ -630,9 +630,9 @@ static int __init gta01_pm_gps_probe(struct platform_device *pdev)
 		case GTA02v4_SYSTEM_REV:
 		case GTA02v5_SYSTEM_REV:
 		case GTA02v6_SYSTEM_REV:
-			pcf50633_voltage_set(pcf50633_global,
+			pcf50633_voltage_set(gta02_pcf_pdata.pcf,
 				PCF50633_REGULATOR_LDO5, 3000);
-			pcf50633_onoff_set(pcf50633_global,
+			pcf50633_onoff_set(gta02_pcf_pdata.pcf,
 				PCF50633_REGULATOR_LDO5, 0);
 			dev_info(&pdev->dev, "FIC Neo1973 GPS Power Managerment:"
 				 "starting\n");
@@ -659,7 +659,7 @@ static int gta01_pm_gps_remove(struct platform_device *pdev)
 	}
 
 	if (machine_is_neo1973_gta02()) {
-		pcf50633_onoff_set(pcf50633_global, PCF50633_REGULATOR_LDO5, 0);
+		pcf50633_onoff_set(gta02_pcf_pdata.pcf, PCF50633_REGULATOR_LDO5, 0);
 		sysfs_remove_group(&pdev->dev.kobj, &gta02_gps_attr_group);
 	}
 	return 0;
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
index 7dd28911904..ebed33558a7 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
@@ -117,7 +117,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
 				case GTA02v4_SYSTEM_REV:
 				case GTA02v5_SYSTEM_REV:
 				case GTA02v6_SYSTEM_REV:
-					pcf50633_gpio_set(pcf50633_global,
+					pcf50633_gpio_set(gta02_pcf_pdata.pcf,
 							  PCF50633_GPIO2, 1);
 					break;
 				}
@@ -134,7 +134,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
 				case GTA02v4_SYSTEM_REV:
 				case GTA02v5_SYSTEM_REV:
 				case GTA02v6_SYSTEM_REV:
-					pcf50633_gpio_set(pcf50633_global,
+					pcf50633_gpio_set(gta02_pcf_pdata.pcf,
 							  PCF50633_GPIO2, 0);
 					break;
 				}
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_host.c b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
index bb25acdb7d2..8ab589b3ad8 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_host.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
@@ -27,7 +27,7 @@ static ssize_t pm_host_read(struct device *dev, struct device_attribute *attr,
 			    char *buf)
 {
 	return sprintf(buf, "%d\n",
-		       pcf50633_gpio_get(pcf50633_global, PCF50633_GPO));
+		       pcf50633_gpio_get(gta02_pcf_pdata.pcf, PCF50633_GPO));
 }
 
 static ssize_t pm_host_write(struct device *dev, struct device_attribute *attr,
@@ -35,7 +35,7 @@ static ssize_t pm_host_write(struct device *dev, struct device_attribute *attr,
 {
 	unsigned long on = simple_strtoul(buf, NULL, 10);
 
-	pcf50633_gpio_set(pcf50633_global, PCF50633_GPO, on);
+	pcf50633_gpio_set(gta02_pcf_pdata.pcf, PCF50633_GPO, on);
 
 	return count;
 }
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
index c7730b60da9..a04466c8960 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
@@ -80,7 +80,7 @@ static ssize_t resume_reason_read(struct device *dev,
 
 #ifdef CONFIG_MACH_NEO1973_GTA02
 		if ((gta) && (bit == 9)) /* PMU */
-			end += pcf50633_report_resumers(pcf50633_global, end);
+			end += pcf50633_report_resumers(gta02_pcf_pdata.pcf, end);
 #endif
 	}