| Message ID | 20220217082954.2967889-18-s.hauer@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/rockchip: RK356x VOP2 support | expand |
Hi > Gesendet: Donnerstag, 17. Februar 2022 um 09:29 Uhr > Von: "Sascha Hauer" <s.hauer@pengutronix.de> > --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi > @@ -10,7 +10,6 @@ > #include <dt-bindings/pinctrl/rockchip.h> > #include <dt-bindings/power/rk3568-power.h> > #include <dt-bindings/soc/rockchip,boot-mode.h> > -#include <dt-bindings/soc/rockchip,vop2.h> why dropping this after adding in part 16? > #include <dt-bindings/thermal/thermal.h> it looks like you moved this to board includes...imho this should stay in the rk356x.dtsi, because compilation will fail if a board without the vop2 (and missing the include) is derived from rk356x.dtsi. regards Frank
On Mon, Feb 21, 2022 at 09:54:28AM +0100, Frank Wunderlich wrote: > Hi > > > Gesendet: Donnerstag, 17. Februar 2022 um 09:29 Uhr > > Von: "Sascha Hauer" <s.hauer@pengutronix.de> > > > --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi > > +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi > > @@ -10,7 +10,6 @@ > > #include <dt-bindings/pinctrl/rockchip.h> > > #include <dt-bindings/power/rk3568-power.h> > > #include <dt-bindings/soc/rockchip,boot-mode.h> > > -#include <dt-bindings/soc/rockchip,vop2.h> > > why dropping this after adding in part 16? > > > #include <dt-bindings/thermal/thermal.h> > > it looks like you moved this to board includes...imho this should stay > in the rk356x.dtsi, because compilation will fail if a board without > the vop2 (and missing the include) is derived from rk356x.dtsi. I dropped adding the include from Patch 16. The include is not needed by rk356x.dtsi. When a board without vop2 support is added then it won't need the include either. Sascha
diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi index 1c24e4219c75e..229ed7a755f3b 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -10,7 +10,6 @@ #include <dt-bindings/pinctrl/rockchip.h> #include <dt-bindings/power/rk3568-power.h> #include <dt-bindings/soc/rockchip,boot-mode.h> -#include <dt-bindings/soc/rockchip,vop2.h> #include <dt-bindings/thermal/thermal.h> / { @@ -503,6 +502,38 @@ vop_mmu: iommu@fe043e00 { status = "disabled"; }; + hdmi: hdmi@fe0a0000 { + compatible = "rockchip,rk3568-dw-hdmi"; + reg = <0x0 0xfe0a0000 0x0 0x20000>; + interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru PCLK_HDMI_HOST>, + <&cru CLK_HDMI_SFR>, + <&cru CLK_HDMI_CEC>, + <&pmucru CLK_HDMI_REF>, + <&cru HCLK_VOP>; + clock-names = "iahb", "isfr", "cec", "ref", "hclk"; + pinctrl-names = "default"; + pinctrl-0 = <&hdmitx_scl &hdmitx_sda &hdmitxm0_cec>; + power-domains = <&power RK3568_PD_VO>; + reg-io-width = <4>; + rockchip,grf = <&grf>; + #sound-dai-cells = <0>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + hdmi_in: port@0 { + reg = <0>; + }; + + hdmi_out: port@1 { + reg = <1>; + }; + }; + }; + qos_gpu: qos@fe128000 { compatible = "rockchip,rk3568-qos", "syscon"; reg = <0x0 0xfe128000 0x0 0x20>;
Add support for the HDMI port found on RK3568. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- Notes: Changes since v5: - Drop unnecessary #size-cells/#address-cells from nodes with only single endpoint arch/arm64/boot/dts/rockchip/rk356x.dtsi | 33 +++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)