Skip to contentSkip to conversation

ARM: dts: rockchip: enable vops and hdmi output on rk3288-firefly and -evb

PATCH New Heiko Stübner 1 participant 3 messages Jan 29, 2015 – Jan 30, 2015 Device tree bindings

lore
Share & tools
lore

Heiko Stübner

author
#0 lore raw

PATCH 1/2 ARM: dts: rockchip: enable vops and hdmi output on rk3288-firefly and -evb

This enables the recently added display nodes on the firefly and evb, letting the boards output graphic data over the hdmi port.

This includes enabling of i2c5 on the evb that is used for ddc probing and setting the lcd-regulators to always on until the hdmi driver learns about using them.

Signed-off-by Heiko Stuebner <[email protected]>
---
 arch/arm/boot/dts/rk3288-evb.dtsi     | 24 ++++++++++++++++++++++++
 arch/arm/boot/dts/rk3288-firefly.dtsi | 22 ++++++++++++++++++++++
 2 files changed, 46 insertions(+)
arch/arm/boot/dts/rk3288-evb.dtsi +24 -0
index 3e067dd..6857730 100644
@@ -104,6 +104,10 @@
 	status = "okay";
 };
 
+&hdmi {
+	status = "okay";
+};
+
 &sdmmc {
 	bus-width = <4>;
 	cap-mmc-highspeed;

@@ -120,6 +124,10 @@
 	status = "okay";
 };
 
+&i2c5 {
+	status = "okay";
+};
+
 &wdt {
 	status = "okay";
 };

@@ -187,3 +195,19 @@
 &usb_host1 {
 	status = "okay";
 };
+
+&vopb {
+	status = "okay";
+};
+
+&vopb_mmu {
+	status = "okay";
+};
+
+&vopl {
+	status = "okay";
+};
+
+&vopl_mmu {
+	status = "okay";
+};
arch/arm/boot/dts/rk3288-firefly.dtsi +22 -0
index 7f0ba9b..6dcc5e9 100644
@@ -179,6 +179,10 @@
 	status = "okay";
 };
 
+&hdmi {
+	status = "okay";
+};
+
 &i2c0 {
 	clock-frequency = <400000>;
 	status = "okay";

@@ -265,6 +269,7 @@
 				regulator-name = "vdd10_lcd";
 				regulator-min-microvolt = <1000000>;
 				regulator-max-microvolt = <1000000>;
+				regulator-always-on;
 			};
 
 			vcca_18: REG7 {

@@ -303,6 +308,7 @@
 				regulator-name = "vcc18_lcd";
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
+				regulator-always-on;
 			};
 		};
 	};

@@ -462,6 +468,22 @@
 	status = "okay";
 };
 
+&vopb {
+	status = "okay";
+};
+
+&vopb_mmu {
+	status = "okay";
+};
+
+&vopl {
+	status = "okay";
+};
+
+&vopl_mmu {
+	status = "okay";
+};
+
 &wdt {
 	status = "okay";
 };
Signature · 1 line
2.1.1
author
#1 lore raw

PATCH 1/2 ARM: dts: rockchip: enable vops and hdmi output on rk3288-firefly and -evb

Am Freitag, 30. Januar 2015, 00:42:30 schrieb Heiko St?bner:

Quoted 9 lines

This enables the recently added display nodes on the firefly and evb, letting the boards output graphic data over the hdmi port.

This includes enabling of i2c5 on the evb that is used for ddc probing and setting the lcd-regulators to always on until the hdmi driver learns about using them.

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

---

added both to my dts branch

author
#2 lore raw

PATCH 2/2 ARM: dts: rockchip: move the hdmi ddc-i2c-bus property to the actual boards

In reply to Heiko Stübner

Currently the hdmi driver is using one of the soc i2c busses for ddc probing and while documentation always specifies i2c5 as hdmi-i2c it could very well be any other bus as well.

Therefore this is a property of the board and should be specified there.

Signed-off-by Heiko Stuebner <[email protected]>
---
 arch/arm/boot/dts/rk3288-evb.dtsi     | 1 +
 arch/arm/boot/dts/rk3288-firefly.dtsi | 1 +
 arch/arm/boot/dts/rk3288.dtsi         | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/rk3288-evb.dtsi +1 -0
index 6857730..86ede58 100644
@@ -105,6 +105,7 @@
 };
 
 &hdmi {
+	ddc-i2c-bus = <&i2c5>;
 	status = "okay";
 };
arch/arm/boot/dts/rk3288-firefly.dtsi +1 -0
index 6dcc5e9..e6f873a 100644
@@ -180,6 +180,7 @@
 };
 
 &hdmi {
+	ddc-i2c-bus = <&i2c5>;
 	status = "okay";
 };
arch/arm/boot/dts/rk3288.dtsi +0 -1
index 1e75a0f..1141850 100644
@@ -646,7 +646,6 @@
 		compatible = "rockchip,rk3288-dw-hdmi";
 		reg = <0xff980000 0x20000>;
 		reg-io-width = <4>;
-		ddc-i2c-bus = <&i2c5>;
 		rockchip,grf = <&grf>;
 		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>;
Signature · 1 line
2.1.1