On Fri, Jun 05, 2015 at 07:06:38PM +0200, Heiko Stübner wrote:
The Rockchip implementation of the IP exposes the supplies outside and expects them to be supplied by a pmic. So implement regulator handling for them.
Signed-off-by: Heiko Stuebner heiko@sntech.de Acked-by: Philipp Zabel p.zabel@pengutronix.de
changes since v3:
- split generic dt-bindings and rockchip implementation
- add Ack from Philipp Zabel
changes since v2:
- rename supplies to the names found in the hdmi IP databook
changes since v1:
- follow suggestion from Russell King to keep regulator handling local to the rockchip implementation for the time being and only generalize when a real second implementation needs regulator handling
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 32 ++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 80d6fc8..9c003fa 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -11,6 +11,7 @@ #include <linux/platform_device.h> #include <linux/mfd/syscon.h> #include <linux/regmap.h> +#include <linux/regulator/consumer.h> #include <drm/drm_of.h> #include <drm/drmP.h> #include <drm/drm_crtc_helper.h> @@ -28,6 +29,9 @@ struct rockchip_hdmi { struct device *dev; struct regmap *regmap; struct drm_encoder encoder;
- struct regulator_bulk_data supplies[2];
- int nsupplies;
unsigned int, please. Also I personally prefer the num_ prefix and it's slightly more common in DRM code (even in the Rockchip driver).
- bool supplies_enabled;
};
#define to_rockchip_hdmi(x) container_of(x, struct rockchip_hdmi, x) @@ -179,6 +183,12 @@ static struct drm_encoder_funcs dw_hdmi_rockchip_encoder_funcs = {
static void dw_hdmi_rockchip_encoder_disable(struct drm_encoder *encoder) {
- struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder);
- if (hdmi->nsupplies > 0 && hdmi->supplies_enabled) {
regulator_bulk_disable(hdmi->nsupplies, hdmi->supplies);hdmi->supplies_enabled = false;- }
}
static bool @@ -199,7 +209,16 @@ static void dw_hdmi_rockchip_encoder_commit(struct drm_encoder *encoder) { struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder); u32 val;
- int mux;
- int mux, ret;
- if (hdmi->nsupplies > 0 && !hdmi->supplies_enabled) {
ret = regulator_bulk_enable(hdmi->nsupplies, hdmi->supplies);if (ret) {dev_err(hdmi->dev, "could not enable hdmi analog supplies\n");
"HDMI" please. And perhaps you want to add the error code to the message as well?
return;}hdmi->supplies_enabled = true;}
mux = rockchip_drm_encoder_get_mux_id(hdmi->dev->of_node, encoder); if (mux)
@@ -275,6 +294,17 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, if (!iores) return -ENXIO;
- hdmi->supplies[0].supply = "vp";
- hdmi->supplies[1].supply = "vph";
- hdmi->nsupplies = 2;
- ret = devm_regulator_bulk_get(hdmi->dev,
hdmi->nsupplies, hdmi->supplies);
I think it'd be slightly more idiomatic to put hdmi->nsupplies on the first line.
Thierry