Skip to contentSkip to conversation

dt-bindings: describe dw_hdmi supplies

PATCH In review Heiko Stübner 2 participants 4 messages Jun 5, 2015 – Jun 8, 2015

Subsystems (5)
Device tree bindings DRM drivers DRM misc Arm Rockchip +1 more subsystems
lore
Share & tools
lore

Heiko Stübner

author maintainer
#0 lore raw

PATCH v4 1/3 dt-bindings: describe dw_hdmi supplies

The Designware HDMI block has two supplies for 1.0 and 1.8V. Not all IP implementations expose or want to use these, so they remain optional.

Signed-off-by Heiko Stuebner <[email protected]>
Acked-by Philipp Zabel <[email protected]>

---
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

 Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt | 4 ++++
 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt +4 -0
index a905c14..ba42d89 100644
@@ -22,6 +22,10 @@ Optional properties
 - ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing
 - clocks, clock-names: phandle to the HDMI CEC clock, name should be "cec"
 
+Optional supplies:
+- vp-supply: 1.0V power supply
+- vph-supply: 1.8V power supply
+
 Example:
 	hdmi: hdmi at 0120000 {
 		compatible = "fsl,imx6q-hdmi";
Signature · 1 line
2.1.4
author maintainer
#1 lore raw

PATCH v4 2/3 drm/rockchip: implement dw_hdmi supplies for the Rockchip implementation

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 <[email protected]>
Acked-by Philipp Zabel <[email protected]>

---
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(-)
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +31 -1
index 80d6fc8..9c003fa 100644
@@ -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;
+	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");
+			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);
+	if (ret == -EPROBE_DEFER)
+		return ret;
+	if (ret)
+		hdmi->nsupplies = 0;
+
 	platform_set_drvdata(pdev, hdmi);
 
 	encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node);
Signature · 1 line
2.1.4
#2 lore raw

Re: [PATCH v4 2/3] drm/rockchip: implement dw_hdmi supplies for the Rockchip implementation

Quoted 33 lines · Heiko St?bner

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 <[email protected]>
Acked-by Philipp Zabel <[email protected]>

---
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(-)
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +1 -0
index 80d6fc8..9c003fa 100644
@@ -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>

drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c struct rockchip_hdmi { · line 33

Quoted 5 lines
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +2 -0
@@ -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).

Quoted 18 lines
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +7 -0
+	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

drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c static void dw_hdmi_rockchip_encoder_commit(struct drm_encoder *encoder) · line 217

Quoted 10 lines
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +6 -1
@@ -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?

Quoted 8 lines
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +4 -0
+			return;
+		}
+		hdmi->supplies_enabled = true;
+	}
 
 	mux = rockchip_drm_encoder_get_mux_id(hdmi->dev->of_node, encoder);
 	if (mux)

drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, · line 302

Quoted 9 lines
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +6 -0
@@ -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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150608/8280d80d/attachment.sig>

author maintainer
#3 lore raw

PATCH v4 3/3 ARM: dts: rockchip: add hdmi analog power supplies to rk3288 boards

In reply to Heiko Stübner

Add the recently added hdmi power supplies to evb and firefly boards.

Signed-off-by Heiko Stuebner <[email protected]>

---
changes since v3:
- add entries for popmetal board

 arch/arm/boot/dts/rk3288-evb.dtsi     | 2 ++
 arch/arm/boot/dts/rk3288-firefly.dtsi | 2 ++
 arch/arm/boot/dts/rk3288-popmetal.dts | 2 ++
 3 files changed, 6 insertions(+)
arch/arm/boot/dts/rk3288-evb.dtsi +2 -0
index 844a6fb..a57fbe3 100644
@@ -172,6 +172,8 @@
 };
 
 &hdmi {
 	ddc-i2c-bus = <&i2c5>;
+	vp-supply = <&vdd10_lcd>;
+	vph-supply = <&vcc18_lcd>;
 	status = "okay";
 };
arch/arm/boot/dts/rk3288-firefly.dtsi +2 -0
index 0b42372..68068d9 100644
@@ -196,6 +196,8 @@
 };
 
 &hdmi {
 	ddc-i2c-bus = <&i2c5>;
+	vp-supply = <&vdd10_lcd>;
+	vph-supply = <&vcc18_lcd>;
 	status = "okay";
 };
arch/arm/boot/dts/rk3288-popmetal.dts +2 -0
index d582811..98f4d77 100644
@@ -141,6 +141,8 @@
 
 &hdmi {
 	ddc-i2c-bus = <&i2c5>;
+	vp-supply = <&vdd10_lcd>;
+	vph-supply = <&vcc18_lcd>;
 	status = "okay";
 };
Signature · 1 line
2.1.4