aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorBalaji Rao <balajirrao@openmoko.org>2009-02-08 16:49:15 +0000
committerAndy Green <agreen@octopus.localdomain>2009-02-08 16:49:15 +0000
commit9dbeaa31ed639d1481cb6a3f2080420eb267e0cd (patch)
treeada6062a5c7a10dbc082132b8568a813c02759d2 /arch/arm
parentd1a9cf85c8608601700aab24e4772420d3e4e6be (diff)
s3c_mci_move_regulator_stuff_to_platform_code.patch
Move the regulator handling stuff away from s3cmci.c to mach-gta01.c. Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c2410/mach-gta01.c63
1 files changed, 62 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
index 629fb7a49b6..6eb8eb3ac46 100644
--- a/arch/arm/mach-s3c2410/mach-gta01.c
+++ b/arch/arm/mach-s3c2410/mach-gta01.c
@@ -279,7 +279,6 @@ static void gta01_pmu_regulator_registered(struct pcf50606 *pcf, int id)
break;
case PCF50606_REGULATOR_D2REG:
gps_registered_regulators++;
- platform_device_register(&s3c_device_sdi);
break;
case PCF50606_REGULATOR_IOREG:
case PCF50606_REGULATOR_DCD:
@@ -551,6 +550,7 @@ static struct platform_device *gta01_devices[] __initdata = {
&s3c_device_wdt,
&s3c_device_i2c0,
&s3c_device_iis,
+ &s3c_device_sdi,
&s3c_device_usbgadget,
&s3c_device_nand,
&s3c_device_ts,
@@ -572,8 +572,69 @@ static struct s3c2410_platform_nand gta01_nand_info = {
.sets = gta01_nand_sets,
};
+static struct regulator *s3c_sdi_regulator;
+
+static void gta01_mmc_set_power(unsigned char power_mode, unsigned short vdd)
+{
+ int bit;
+ int mv = 1700; /* 1.7V for MMC_VDD_165_195 */
+ struct regulator *regulator;
+
+ printk(KERN_DEBUG "mmc_set_power(power_mode=%u, vdd=%u)\n",
+ power_mode, vdd);
+
+ if (!s3c_sdi_regulator) {
+ s3c_sdi_regulator =
+ regulator_get(&s3c_device_sdi.dev, "SD_3V3");
+ if (!s3c_sdi_regulator) {
+ printk(KERN_ERR "gta01_mmc_set_power : Cannot get regulator");
+ return;
+ }
+ }
+
+ regulator = s3c_sdi_regulator;
+
+ return;
+ switch (system_rev) {
+ case GTA01v3_SYSTEM_REV:
+ switch (power_mode) {
+ case MMC_POWER_OFF:
+ regulator_disable(regulator);
+ break;
+ case MMC_POWER_ON:
+ /* translate MMC_VDD_* VDD bit to mv */
+ for (bit = 8; bit != 24; bit++)
+ if (vdd == (1 << bit))
+ mv += 100 * (bit - 4);
+ regulator_set_voltage(regulator, mv * 1000, mv * 10000);
+ break;
+ case MMC_POWER_UP:
+ regulator_enable(regulator);
+ break;
+ }
+ break;
+ case GTA01v4_SYSTEM_REV:
+ case GTA01Bv2_SYSTEM_REV:
+ case GTA01Bv3_SYSTEM_REV:
+ case GTA01Bv4_SYSTEM_REV:
+ switch (power_mode) {
+ case MMC_POWER_OFF:
+ neo1973_gpb_setpin(GTA01_GPIO_SDMMC_ON, 1);
+ break;
+ case MMC_POWER_ON:
+ neo1973_gpb_setpin(GTA01_GPIO_SDMMC_ON, 0);
+ break;
+ }
+ break;
+ }
+
+ if (regulator)
+ regulator_put(regulator);
+}
+
static struct s3c24xx_mci_pdata gta01_mmc_cfg = {
.gpio_detect = GTA01_GPIO_nSD_DETECT,
+ .set_power = &gta01_mmc_set_power,
.ocr_avail = MMC_VDD_165_195|MMC_VDD_20_21|
MMC_VDD_21_22|MMC_VDD_22_23|MMC_VDD_23_24|
MMC_VDD_24_25|MMC_VDD_25_26|MMC_VDD_26_27|