diff mbox series

arm64: dts: rockchip: Enable video output on Station M2

Message ID 20220627202208.45770-1-f.kardame@manjaro.org (mailing list archive)
State New, archived
Headers show
Series arm64: dts: rockchip: Enable video output on Station M2 | expand

Commit Message

Furkan Kardame June 27, 2022, 8:22 p.m. UTC
Add the device tree nodes to enable video output on the Station M2.
Enable the GPU and HDMI nodes and fix the GPU regulator range.

Signed-off-by: Furkan Kardame <f.kardame@manjaro.org>
---
 .../arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

Comments

Heiko Stübner Sept. 13, 2022, 12:10 p.m. UTC | #1
Hi,

Am Montag, 27. Juni 2022, 22:22:08 CEST schrieb Furkan Kardame:
> Add the device tree nodes to enable video output on the Station M2.

what is this "Station M2". You're changing the rk3566-roc-pc device,
which I think is "just" an SBC?

Does the rk3566-roc-pc in general have a hdmi port as well?


Heiko

> Enable the GPU and HDMI nodes and fix the GPU regulator range.
> 
> Signed-off-by: Furkan Kardame <f.kardame@manjaro.org>
> ---
>  .../arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 52 +++++++++++++++++++
>  1 file changed, 52 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
> index 57759b66d..dba648c2f 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
> @@ -4,6 +4,7 @@
>  
>  #include <dt-bindings/gpio/gpio.h>
>  #include <dt-bindings/pinctrl/rockchip.h>
> +#include <dt-bindings/soc/rockchip,vop2.h>
>  #include "rk3566.dtsi"
>  
>  / {
> @@ -27,6 +28,17 @@ gmac1_clkin: external-gmac1-clock {
>  		#clock-cells = <0>;
>  	};
>  
> +	hdmi-con {
> +		compatible = "hdmi-connector";
> +		type = "a";
> +
> +		port {
> +			hdmi_con_in: endpoint {
> +				remote-endpoint = <&hdmi_out_con>;
> +			};
> +		};
> +	};
> +
>  	leds {
>  		compatible = "gpio-leds";
>  
> @@ -149,6 +161,29 @@ &gmac1m0_clkinout
>  	status = "okay";
>  };
>  
> +&gpu {
> +	mali-supply = <&vdd_gpu>;
> +	status = "okay";
> +};
> +
> +&hdmi {
> +	avdd-0v9-supply = <&vdda0v9_image>;
> +	avdd-1v8-supply = <&vcca1v8_image>;
> +	status = "okay";
> +};
> +
> +&hdmi_in {
> +	hdmi_in_vp0: endpoint {
> +		remote-endpoint = <&vp0_out_hdmi>;
> +	};
> +};
> +
> +&hdmi_out {
> +	hdmi_out_con: endpoint {
> +		remote-endpoint = <&hdmi_con_in>;
> +	};
> +};
> +
>  &i2c0 {
>  	status = "okay";
>  
> @@ -577,3 +612,20 @@ &usb_host0_ehci {
>  &usb_host0_ohci {
>  	status = "okay";
>  };
> +
> +&vop {
> +	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
> +	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
> +	status = "okay";
> +};
> +
> +&vop_mmu {
> +	status = "okay";
> +};
> +
> +&vp0 {
> +	vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
> +		reg = <ROCKCHIP_VOP2_EP_HDMI0>;
> +		remote-endpoint = <&hdmi_in_vp0>;
> +	};
> +};
>
Furkan Kardame Sept. 13, 2022, 12:18 p.m. UTC | #2
Hello

On Tuesday 13 September 2022 15:10:25 (+03:00), Heiko Stuebner wrote:

 > Hi,
 >
 > Am Montag, 27. Juni 2022, 22:22:08 CEST schrieb Furkan Kardame:
 > > Add the device tree nodes to enable video output on the Station M2.
 >
 > what is this "Station M2". You're changing the rk3566-roc-pc device,
 > which I think is "just" an SBC?

Station M2 is the same SBC with a case on.  Station M2 Link: 
https://www.firefly.store/goods.php?id=142
Rk3566-roc-pc is the barebone sbc without the casing.  : 
https://en.t-firefly.com/product/industry/rocrk3566pc.html

 >
 > Does the rk3566-roc-pc in general have a hdmi port as well?
Yes it have hdmi port.
 >
 >
 > Heiko
 >
 > > Enable the GPU and HDMI nodes and fix the GPU regulator range.
 > >
 > > Signed-off-by: Furkan Kardame <f.kardame@manjaro.org>
 > > ---
 > > .../arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 52 +++++++++++++++++++
 > > 1 file changed, 52 insertions(+)
 > >
 > > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts 
b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
 > > index 57759b66d..dba648c2f 100644
 > > --- a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
 > > +++ b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
 > > @@ -4,6 +4,7 @@
 > >
 > > #include <dt-bindings/gpio/gpio.h>
 > > #include <dt-bindings/pinctrl/rockchip.h>
 > > +#include <dt-bindings/soc/rockchip,vop2.h>
 > > #include "rk3566.dtsi"
 > >
 > > / {
 > > @@ -27,6 +28,17 @@ gmac1_clkin: external-gmac1-clock {
 > > #clock-cells = <0>;
 > > };
 > >
 > > + hdmi-con {
 > > + compatible = "hdmi-connector";
 > > + type = "a";
 > > +
 > > + port {
 > > + hdmi_con_in: endpoint {
 > > + remote-endpoint = <&hdmi_out_con>;
 > > + };
 > > + };
 > > + };
 > > +
 > > leds {
 > > compatible = "gpio-leds";
 > >
 > > @@ -149,6 +161,29 @@ &gmac1m0_clkinout
 > > status = "okay";
 > > };
 > >
 > > +&gpu {
 > > + mali-supply = <&vdd_gpu>;
 > > + status = "okay";
 > > +};
 > > +
 > > +&hdmi {
 > > + avdd-0v9-supply = <&vdda0v9_image>;
 > > + avdd-1v8-supply = <&vcca1v8_image>;
 > > + status = "okay";
 > > +};
 > > +
 > > +&hdmi_in {
 > > + hdmi_in_vp0: endpoint {
 > > + remote-endpoint = <&vp0_out_hdmi>;
 > > + };
 > > +};
 > > +
 > > +&hdmi_out {
 > > + hdmi_out_con: endpoint {
 > > + remote-endpoint = <&hdmi_con_in>;
 > > + };
 > > +};
 > > +
 > > &i2c0 {
 > > status = "okay";
 > >
 > > @@ -577,3 +612,20 @@ &usb_host0_ehci {
 > > &usb_host0_ohci {
 > > status = "okay";
 > > };
 > > +
 > > +&vop {
 > > + assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
 > > + assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
 > > + status = "okay";
 > > +};
 > > +
 > > +&vop_mmu {
 > > + status = "okay";
 > > +};
 > > +
 > > +&vp0 {
 > > + vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
 > > + reg = <ROCKCHIP_VOP2_EP_HDMI0>;
 > > + remote-endpoint = <&hdmi_in_vp0>;
 > > + };
 > > +};
 > >
 >
 >
 >
 >
 >
Vincent Legoll Sept. 13, 2022, 1:26 p.m. UTC | #3
Hello

On Tue, Sep 13, 2022 at 2:10 PM Heiko Stuebner <heiko@sntech.de> wrote:
> what is this "Station M2". You're changing the rk3566-roc-pc device,
> which I think is "just" an SBC?

I suppose this is it:
https://www.firefly.store/goods.php?id=142
Furkan Kardame Sept. 13, 2022, 1:28 p.m. UTC | #4
Hello

On Tuesday 13 September 2022 16:26:11 (+03:00), Vincent Legoll wrote:

> Hello
>
> On Tue, Sep 13, 2022 at 2:10 PM Heiko Stuebner <heiko@sntech.de> wrote:
> > what is this "Station M2". You're changing the rk3566-roc-pc device,
> > which I think is "just" an SBC?
>
> I suppose this is it:
> https://www.firefly.store/goods.php?id=142
>
yes this is Station M2 = rk3566-roc-pc (Without case)
Heiko Stübner Sept. 15, 2022, 1:49 p.m. UTC | #5
On Mon, 27 Jun 2022 23:22:08 +0300, Furkan Kardame wrote:
> Add the device tree nodes to enable video output on the Station M2.
> Enable the GPU and HDMI nodes and fix the GPU regulator range.

Applied, thanks!

[1/1] arm64: dts: rockchip: Enable video output on Station M2
      commit: 0209861877531ae0744552f3fd0531303d665b52

I have changed the device name in the patch subject to rk3566-roc-pc

Best regards,
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
index 57759b66d..dba648c2f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
@@ -4,6 +4,7 @@ 
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/soc/rockchip,vop2.h>
 #include "rk3566.dtsi"
 
 / {
@@ -27,6 +28,17 @@  gmac1_clkin: external-gmac1-clock {
 		#clock-cells = <0>;
 	};
 
+	hdmi-con {
+		compatible = "hdmi-connector";
+		type = "a";
+
+		port {
+			hdmi_con_in: endpoint {
+				remote-endpoint = <&hdmi_out_con>;
+			};
+		};
+	};
+
 	leds {
 		compatible = "gpio-leds";
 
@@ -149,6 +161,29 @@  &gmac1m0_clkinout
 	status = "okay";
 };
 
+&gpu {
+	mali-supply = <&vdd_gpu>;
+	status = "okay";
+};
+
+&hdmi {
+	avdd-0v9-supply = <&vdda0v9_image>;
+	avdd-1v8-supply = <&vcca1v8_image>;
+	status = "okay";
+};
+
+&hdmi_in {
+	hdmi_in_vp0: endpoint {
+		remote-endpoint = <&vp0_out_hdmi>;
+	};
+};
+
+&hdmi_out {
+	hdmi_out_con: endpoint {
+		remote-endpoint = <&hdmi_con_in>;
+	};
+};
+
 &i2c0 {
 	status = "okay";
 
@@ -577,3 +612,20 @@  &usb_host0_ehci {
 &usb_host0_ohci {
 	status = "okay";
 };
+
+&vop {
+	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
+	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
+	status = "okay";
+};
+
+&vop_mmu {
+	status = "okay";
+};
+
+&vp0 {
+	vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
+		reg = <ROCKCHIP_VOP2_EP_HDMI0>;
+		remote-endpoint = <&hdmi_in_vp0>;
+	};
+};