aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2016-04-28 08:42:18 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2016-05-31 01:28:31 -0400
commit973999aa0140481e590e791c320009d25a88d377 (patch)
tree6eb92f72074aaa2b01153b79e2abfec09db6b82c
parent4bafcbc77fb0b26b0052dbd577ccc888a63e6404 (diff)
drm/omap: Remove regulator API abuse
regulator_can_change_voltage() is deprecated and it's use is not necessary as commit: 6a0028b3dd67b regulator: Deprecate regulator_can_change_voltage() describers it clearly. Also, regulator_set_voltage() is misused in the driver, as it is supposed to be used only in cases where the regulator voltage needs to be changed dynamically at runtime. In DSS's case, we always want a fixed voltage, set in the .dts files. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/gpu/drm/omapdrm/dss/dsi.c9
-rw-r--r--drivers/gpu/drm/omapdrm/dss/hdmi4.c9
-rw-r--r--drivers/gpu/drm/omapdrm/dss/hdmi5.c9
3 files changed, 0 insertions, 27 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 8730646a0cbb..9ed8272e54ae 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -1180,15 +1180,6 @@ static int dsi_regulator_init(struct platform_device *dsidev)
1180 return PTR_ERR(vdds_dsi); 1180 return PTR_ERR(vdds_dsi);
1181 } 1181 }
1182 1182
1183 if (regulator_can_change_voltage(vdds_dsi)) {
1184 r = regulator_set_voltage(vdds_dsi, 1800000, 1800000);
1185 if (r) {
1186 devm_regulator_put(vdds_dsi);
1187 DSSERR("can't set the DSI regulator voltage\n");
1188 return r;
1189 }
1190 }
1191
1192 dsi->vdds_dsi_reg = vdds_dsi; 1183 dsi->vdds_dsi_reg = vdds_dsi;
1193 1184
1194 return 0; 1185 return 0;
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index eef260ff420d..f93c70acb768 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -115,15 +115,6 @@ static int hdmi_init_regulator(void)
115 return PTR_ERR(reg); 115 return PTR_ERR(reg);
116 } 116 }
117 117
118 if (regulator_can_change_voltage(reg)) {
119 r = regulator_set_voltage(reg, 1800000, 1800000);
120 if (r) {
121 devm_regulator_put(reg);
122 DSSWARN("can't set the regulator voltage\n");
123 return r;
124 }
125 }
126
127 hdmi.vdda_reg = reg; 118 hdmi.vdda_reg = reg;
128 119
129 return 0; 120 return 0;
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index 417dff5eb7cb..e129245eb8a9 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -132,15 +132,6 @@ static int hdmi_init_regulator(void)
132 return PTR_ERR(reg); 132 return PTR_ERR(reg);
133 } 133 }
134 134
135 if (regulator_can_change_voltage(reg)) {
136 r = regulator_set_voltage(reg, 1800000, 1800000);
137 if (r) {
138 devm_regulator_put(reg);
139 DSSWARN("can't set the regulator voltage\n");
140 return r;
141 }
142 }
143
144 hdmi.vdda_reg = reg; 135 hdmi.vdda_reg = reg;
145 136
146 return 0; 137 return 0;