summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-11-30 17:17:36 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2009-11-30 17:17:36 +1100
commitaa6ea5b7ab2f6e2c7a89de0577becbc401feb390 (patch)
treef9ef7d95a4c410931f38509093ee3500e35d2979
parente480665fc17a81286da132f5e524292dab78ddd1 (diff)
Revert "da903x_bl: control WLED output current in da9034"
This reverts commit ed084c0f6b7e003194276d74ef9087b78c180409.
-rw-r--r--drivers/video/backlight/da903x_bl.c7
-rw-r--r--include/linux/mfd/da903x.h4
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
index 9cbd01d90d3e..701a1081e199 100644
--- a/drivers/video/backlight/da903x_bl.c
+++ b/drivers/video/backlight/da903x_bl.c
@@ -25,7 +25,6 @@
#define DA9034_WLED_CONTROL1 0x3C
#define DA9034_WLED_CONTROL2 0x3D
-#define DA9034_WLED_ISET(x) ((x) & 0x1f)
#define DA9034_WLED_BOOST_EN (1 << 5)
@@ -102,7 +101,6 @@ static struct backlight_ops da903x_backlight_ops = {
static int da903x_backlight_probe(struct platform_device *pdev)
{
- struct da9034_backlight_pdata *pdata = pdev->dev.platform_data;
struct da903x_backlight_data *data;
struct backlight_device *bl;
int max_brightness;
@@ -129,11 +127,6 @@ static int da903x_backlight_probe(struct platform_device *pdev)
data->da903x_dev = pdev->dev.parent;
data->current_brightness = 0;
- /* adjust the WLED output current */
- if (pdata)
- da903x_write(dev, DA9034_WLED_CONTROL2,
- DA9034_WLED_ISET(pdata->output_current));
-
bl = backlight_device_register(pdev->name, data->da903x_dev,
data, &da903x_backlight_ops);
if (IS_ERR(bl)) {
diff --git a/include/linux/mfd/da903x.h b/include/linux/mfd/da903x.h
index 0aa3a1a49ee3..c63b65c94429 100644
--- a/include/linux/mfd/da903x.h
+++ b/include/linux/mfd/da903x.h
@@ -96,10 +96,6 @@ struct da9034_touch_pdata {
int y_inverted;
};
-struct da9034_backlight_pdata {
- int output_current; /* output current of WLED, from 0-31 (in mA) */
-};
-
/* DA9030 battery charger data */
struct power_supply_info;