diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-10-30 16:03:32 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-11-20 14:25:58 -0800 |
| commit | 1263594ac4592804a8f49e73b42ed9c2f41644db (patch) | |
| tree | 04f5f84e90e5a6f72d1e0dddc29885d6bf6d4836 /drivers | |
| parent | 4f911e64b91df9adde8137cfa408639167cf250a (diff) | |
| download | olio-linux-3.10-1263594ac4592804a8f49e73b42ed9c2f41644db.tar.xz olio-linux-3.10-1263594ac4592804a8f49e73b42ed9c2f41644db.zip | |
Power changes: Removed dummy regulators, added cpufreq table initialization and makes sure that cpufreq gets initialized properly.
Change-Id: I679d86c150e4acee098e4a5cfe1855d46fac872a
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpufreq/omap-cpufreq.c | 7 | ||||
| -rw-r--r-- | drivers/leds/leds-lm3530.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c index 0279d18a57f..3bdb1d9c786 100644 --- a/drivers/cpufreq/omap-cpufreq.c +++ b/drivers/cpufreq/omap-cpufreq.c @@ -246,16 +246,19 @@ static struct cpufreq_driver omap_driver = { static int omap_cpufreq_probe(struct platform_device *pdev) { + printk ("%s: OLIO: Entered\n", __FUNCTION__); + mpu_dev = get_cpu_device(0); if (!mpu_dev) { pr_warning("%s: unable to get the mpu device\n", __func__); return -EINVAL; } - mpu_reg = regulator_get(mpu_dev, "vcc"); + mpu_reg = regulator_get(mpu_dev, "vdd_mpu_iva"); /* OLIO: Orig "vcc" */ if (IS_ERR(mpu_reg)) { - pr_warning("%s: unable to get MPU regulator\n", __func__); + pr_warning("%s: unable to get MPU regulator, will try again in a bit\n", __func__); mpu_reg = NULL; + return -EPROBE_DEFER; } else { /* * Ensure physical regulator is present. diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c index fda0efb4f88..89499d369ea 100644 --- a/drivers/leds/leds-lm3530.c +++ b/drivers/leds/leds-lm3530.c @@ -449,7 +449,11 @@ static int lm3530_probe(struct i2c_client *client, i2c_set_clientdata(client, drvdata); - drvdata->regulator = devm_regulator_get(&client->dev, "vin"); + /* OLIO: The regulator name should be passed through the platform_data + * structure. Fixme. + */ + + drvdata->regulator = devm_regulator_get(&client->dev, "vdds_dsi"); if (IS_ERR(drvdata->regulator)) { dev_err(&client->dev, "regulator get failed\n"); err = PTR_ERR(drvdata->regulator); |