Merge tag 'v5.5-rockchip-dts32-2' of...

Merge tag 'v5.5-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

HDMI-audio support for Veyron devices.

* tag 'v5.5-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Add HDMI audio support to rk3288-veyron-mickey
  ARM: dts: rockchip: Add HDMI support to rk3288-veyron-analog-audio

Link: https://lore.kernel.org/r/1926436.N9mSsAMzn9@philSigned-off-by: Olof Johansson <olof@lixom.net>

arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi

@@ -17,6 +17,7 @@ sound {
 		rockchip,hp-det-gpios = <&gpio6 RK_PA5 GPIO_ACTIVE_HIGH>;
 		rockchip,mic-det-gpios = <&gpio6 RK_PB3 GPIO_ACTIVE_LOW>;
 		rockchip,headset-codec = <&headsetcodec>;
+		rockchip,hdmi-codec = <&hdmi>;
 	};
 };
 

arch/arm/boot/dts/rk3288-veyron-mickey.dts

@@ -28,6 +28,13 @@ vcc33_io: vcc33_io {
 		regulator-boot-on;
 		vin-supply = <&vcc33_sys>;
 	};
+
+	sound {
+		compatible = "rockchip,rockchip-audio-max98090";
+		rockchip,model = "VEYRON-HDMI";
+		rockchip,hdmi-codec = <&hdmi>;
+		rockchip,i2s-controller = <&i2s>;
+	};
 };
 
 &cpu_thermal {