queue-6.1/arm64-dts-rockchip-fix-rk3399-hdmi-ports-node.patch

   1 From 05a51f0a79eb4fd03e99cc06f6f2fce74d73f3fd Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Wed, 31 Jan 2024 22:17:31 +0100
   4 Subject: arm64: dts: rockchip: fix rk3399 hdmi ports node
   5
   6 From: Johan Jonker <jbx6244@gmail.com>
   7
   8 [ Upstream commit f051b6ace7ffcc48d6d1017191f167c0a85799f6 ]
   9
  10 Fix rk3399 hdmi ports node so that it matches the
  11 rockchip,dw-hdmi.yaml binding.
  12
  13 Signed-off-by: Johan Jonker <jbx6244@gmail.com>
  14 Link: https://lore.kernel.org/r/a6ab6f75-3b80-40b1-bd30-3113e14becdd@gmail.com
  15 Signed-off-by: Heiko Stuebner <heiko@sntech.de>
  16 Signed-off-by: Sasha Levin <sashal@kernel.org>
  17 ---
  18  arch/arm64/boot/dts/rockchip/rk3399.dtsi | 12 ++++++++++--
  19  1 file changed, 10 insertions(+), 2 deletions(-)
  20
  21 diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
  22 index a7e6eccb14cc6..8363cc13ec517 100644
  23 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
  24 +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
  25 @@ -1906,6 +1906,7 @@ simple-audio-card,codec {
  26         hdmi: hdmi@ff940000 {
  27                 compatible = "rockchip,rk3399-dw-hdmi";
  28                 reg = <0x0 0xff940000 0x0 0x20000>;
  29 +               reg-io-width = <4>;
  30                 interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH 0>;
  31                 clocks = <&cru PCLK_HDMI_CTRL>,
  32                          <&cru SCLK_HDMI_SFR>,
  33 @@ -1914,13 +1915,16 @@ hdmi: hdmi@ff940000 {
  34                          <&cru PLL_VPLL>;
  35                 clock-names = "iahb", "isfr", "cec", "grf", "ref";
  36                 power-domains = <&power RK3399_PD_HDCP>;
  37 -               reg-io-width = <4>;
  38                 rockchip,grf = <&grf>;
  39                 #sound-dai-cells = <0>;
  40                 status = "disabled";
  41
  42                 ports {
  43 -                       hdmi_in: port {
  44 +                       #address-cells = <1>;
  45 +                       #size-cells = <0>;
  46 +
  47 +                       hdmi_in: port@0 {
  48 +                               reg = <0>;
  49                                 #address-cells = <1>;
  50                                 #size-cells = <0>;
  51
  52 @@ -1933,6 +1937,10 @@ hdmi_in_vopl: endpoint@1 {
  53                                         remote-endpoint = <&vopl_out_hdmi>;
  54                                 };
  55                         };
  56 +
  57 +                       hdmi_out: port@1 {
  58 +                               reg = <1>;
  59 +                       };
  60                 };
  61         };
  62
  63 --
  64 2.43.0
  65