summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-ux500/board-mop500-mcde.c4
-rw-r--r--drivers/video/mcde/display-generic_dsi.c13
2 files changed, 11 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-mcde.c b/arch/arm/mach-ux500/board-mop500-mcde.c
index b4a6147291f..d7104eb5050 100644
--- a/arch/arm/mach-ux500/board-mop500-mcde.c
+++ b/arch/arm/mach-ux500/board-mop500-mcde.c
@@ -132,7 +132,7 @@ static struct mcde_display_generic_platform_data generic_display0_pdata = {
#ifdef CONFIG_REGULATOR
.regulator_id = "v-display",
.min_supply_voltage = 2500000, /* 2.5V */
- .max_supply_voltage = 2700000 /* 2.7V */
+ .max_supply_voltage = 2800000 /* 2.8V */
#endif
};
@@ -194,7 +194,7 @@ static struct mcde_display_generic_platform_data generic_subdisplay_pdata = {
#ifdef CONFIG_REGULATOR
.regulator_id = "v-display",
.min_supply_voltage = 2500000, /* 2.5V */
- .max_supply_voltage = 2700000 /* 2.7V */
+ .max_supply_voltage = 2800000 /* 2.8V */
#endif
};
diff --git a/drivers/video/mcde/display-generic_dsi.c b/drivers/video/mcde/display-generic_dsi.c
index 6af7fb77fcd..5e3b38ccba1 100644
--- a/drivers/video/mcde/display-generic_dsi.c
+++ b/drivers/video/mcde/display-generic_dsi.c
@@ -174,13 +174,18 @@ static int __devinit generic_probe(struct mcde_display_device *dev)
pdata->regulator = NULL;
goto regulator_get_failed;
}
- ret = regulator_set_voltage(pdata->regulator,
+
+ if (regulator_set_voltage(pdata->regulator,
pdata->min_supply_voltage,
- pdata->max_supply_voltage);
- if (ret < 0) {
+ pdata->max_supply_voltage) < 0) {
+ int volt;
+
dev_warn(&dev->dev,
- "%s:Failed to set regulator '%s'\n",
+ "%s:Failed to set voltage '%s'\n",
__func__, pdata->regulator_id);
+ volt = regulator_get_voltage(pdata->regulator);
+ dev_warn(&dev->dev,
+ "Voltage:%d\n", volt);
}
/*