A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

backlight: fix broken regulator API usage in l4f00242t03

Browse source 
The regulator support in the l4f00242t03 is very non-idiomatic.  Rather
than requesting the regulators based on the device name and the supply
names used by the device the driver requires boards to pass system
specific supply names around through platform data.  The driver also
conditionally requests the regulators based on this platform data, adding
unneeded conditional code to the driver.

Fix this by removing the platform data and converting to the standard
idiom, also updating all in tree users of the driver.  As no datasheet
appears to be available for the LCD I'm guessing the names for the
supplies based on the existing users and I've no ability to do anything
more than compile test.

The use of regulator_set_voltage() in the driver is also problematic,
since fixed voltages are required the expectation would be that the
voltages would be fixed in the constraints set by the machines rather than
manually configured by the driver, but is less problematic.

Signed-off-by: Mark Brown <[email protected]>
Tested-by: Fabio Estevam <[email protected]>
Cc: Richard Purdie <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Mark Brown 2011-10-31 17:11:48 -07:00 • committed by Linus Torvalds
commit 0556dc340e
4 changed files with 24 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

57
drivers/video/backlight/l4f00242t03.c
View file

@ -52,15 +52,11 @@ static void l4f00242t03_lcd_init(struct spi_device *spi)
dev_dbg(&spi->dev, "initializing LCD\n");
if (priv->io_reg) {
regulator_set_voltage(priv->io_reg, 1800000, 1800000);
regulator_enable(priv->io_reg);
}
regulator_set_voltage(priv->io_reg, 1800000, 1800000);
regulator_enable(priv->io_reg);
if (priv->core_reg) {
regulator_set_voltage(priv->core_reg, 2800000, 2800000);
regulator_enable(priv->core_reg);
}
regulator_set_voltage(priv->core_reg, 2800000, 2800000);
regulator_enable(priv->core_reg);
l4f00242t03_reset(pdata->reset_gpio);
@ -78,11 +74,8 @@ static void l4f00242t03_lcd_powerdown(struct spi_device *spi)
gpio_set_value(pdata->data_enable_gpio, 0);
if (priv->io_reg)
regulator_disable(priv->io_reg);
if (priv->core_reg)
regulator_disable(priv->core_reg);
regulator_disable(priv->io_reg);
regulator_disable(priv->core_reg);
}
static int l4f00242t03_lcd_power_get(struct lcd_device *ld)
@ -201,24 +194,18 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
if (ret)
goto err3;
if (pdata->io_supply) {
priv->io_reg = regulator_get(NULL, pdata->io_supply);
if (IS_ERR(priv->io_reg)) {
pr_err("%s: Unable to get the IO regulator\n",
__func__);
goto err3;
}
priv->io_reg = regulator_get(&spi->dev, "vdd");
if (IS_ERR(priv->io_reg)) {
dev_err(&spi->dev, "%s: Unable to get the IO regulator\n",
__func__);
goto err3;
}
if (pdata->core_supply) {
priv->core_reg = regulator_get(NULL, pdata->core_supply);
if (IS_ERR(priv->core_reg)) {
pr_err("%s: Unable to get the core regulator\n",
__func__);
goto err4;
}
priv->core_reg = regulator_get(&spi->dev, "vcore");
if (IS_ERR(priv->core_reg)) {
dev_err(&spi->dev, "%s: Unable to get the core regulator\n",
__func__);
goto err4;
}
priv->ld = lcd_device_register("l4f00242t03",
@ -238,11 +225,9 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
return 0;
err5:
if (priv->core_reg)
regulator_put(priv->core_reg);
regulator_put(priv->core_reg);
err4:
if (priv->io_reg)
regulator_put(priv->io_reg);
regulator_put(priv->io_reg);
err3:
gpio_free(pdata->data_enable_gpio);
err2:
@ -266,10 +251,8 @@ static int __devexit l4f00242t03_remove(struct spi_device *spi)
gpio_free(pdata->data_enable_gpio);
gpio_free(pdata->reset_gpio);
if (priv->io_reg)
regulator_put(priv->io_reg);
if (priv->core_reg)
regulator_put(priv->core_reg);
regulator_put(priv->io_reg);
regulator_put(priv->core_reg);
kfree(priv);