Re: [PATCH] arm64: dts: rockchip: Enable HDMI and GPU on quartz64-b

[Heiko Stuebner]

Hi,

Am Donnerstag, 22. September 2022, 23:22:37 CEST schrieb Dan Johansen:
> This seems to be based against linux-next and not mainline. It fails to 
> apply on mainline for me.

I would not expect things any other way though :-) .
I.e. in the current cycle everything new is of course targetting
v6.1 and the Quartz boards already saw some other changes.


> Den 20.09.2022 kl. 16.34 skrev Nicolas Frattaroli:
> > This enables the GPU and HDMI output (including HDMI audio) on
> > the PINE64 Quartz64 Model B single board computer.
> >
> > Signed-off-by: Nicolas Frattaroli <frattaroli.nicolas@xxxxxxxxx>
> > ---
> >   .../boot/dts/rockchip/rk3566-quartz64-b.dts   | 60 +++++++++++++++++++
> >   1 file changed, 60 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
> > index 0f623198970f..77b179cd20e7 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
> > +++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.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"
> >   
> >   / {
> > @@ -28,6 +29,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";
> >   
> > @@ -183,6 +195,33 @@ &gmac1m1_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>;
> > +	};
> > +};
> > +
> > +&hdmi_sound {
> > +	status = "okay";
> > +};
> > +
> >   &i2c0 {
> >   	status = "okay";
> >   
> > @@ -456,6 +495,10 @@ &i2c5 {
> >   	status = "disabled";
> >   };
> >   
> > +&i2s0_8ch {
> > +	status = "okay";
> > +};
> > +
> >   &i2s1_8ch {
> >   	pinctrl-names = "default";
> >   	pinctrl-0 = <&i2s1m0_sclktx
> The above part does not seem to exist in the current mainline (rc6) git 
> repo.

which is of course already in linux-next, so this
patch just applied nicely.


Heiko

> > @@ -677,3 +720,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>;
> > +	};
> > +};
>