releases/6.8.6/arm-dts-rockchip-fix-rk3288-hdmi-ports-node.patch

   1 From a2965b7b59c876a5bca432ffd07deb38319f8522 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Wed, 31 Jan 2024 22:16:41 +0100
   4 Subject: ARM: dts: rockchip: fix rk3288 hdmi ports node
   5
   6 From: Johan Jonker <jbx6244@gmail.com>
   7
   8 [ Upstream commit 585e4dc07100a6465b3da8d24e46188064c1c925 ]
   9
  10 Fix rk3288 hdmi ports node so that it matches the
  11 rockchip,dw-hdmi.yaml binding with some reordering
  12 to align with the (new) documentation about
  13 property ordering.
  14
  15 Signed-off-by: Johan Jonker <jbx6244@gmail.com>
  16 Link: https://lore.kernel.org/r/cc3a9b4f-076d-4660-b464-615003b6a066@gmail.com
  17 Signed-off-by: Heiko Stuebner <heiko@sntech.de>
  18 Signed-off-by: Sasha Levin <sashal@kernel.org>
  19 ---
  20  arch/arm/boot/dts/rockchip/rk3288.dtsi | 16 +++++++++++++---
  21  1 file changed, 13 insertions(+), 3 deletions(-)
  22
  23 diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
  24 index ead343dc3df10..3f1d640afafae 100644
  25 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
  26 +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
  27 @@ -1240,27 +1240,37 @@ hdmi: hdmi@ff980000 {
  28                 compatible = "rockchip,rk3288-dw-hdmi";
  29                 reg = <0x0 0xff980000 0x0 0x20000>;
  30                 reg-io-width = <4>;
  31 -               #sound-dai-cells = <0>;
  32 -               rockchip,grf = <&grf>;
  33                 interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
  34                 clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>, <&cru SCLK_HDMI_CEC>;
  35                 clock-names = "iahb", "isfr", "cec";
  36                 power-domains = <&power RK3288_PD_VIO>;
  37 +               rockchip,grf = <&grf>;
  38 +               #sound-dai-cells = <0>;
  39                 status = "disabled";
  40
  41                 ports {
  42 -                       hdmi_in: port {
  43 +                       #address-cells = <1>;
  44 +                       #size-cells = <0>;
  45 +
  46 +                       hdmi_in: port@0 {
  47 +                               reg = <0>;
  48                                 #address-cells = <1>;
  49                                 #size-cells = <0>;
  50 +
  51                                 hdmi_in_vopb: endpoint@0 {
  52                                         reg = <0>;
  53                                         remote-endpoint = <&vopb_out_hdmi>;
  54                                 };
  55 +
  56                                 hdmi_in_vopl: endpoint@1 {
  57                                         reg = <1>;
  58                                         remote-endpoint = <&vopl_out_hdmi>;
  59                                 };
  60                         };
  61 +
  62 +                       hdmi_out: port@1 {
  63 +                               reg = <1>;
  64 +                       };
  65                 };
  66         };
  67
  68 --
  69 2.43.0
  70