mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-30 20:30:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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@phil
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2019-11-10 21:27:32 -08:00
parent 7c3ddc6b03 bbf8f6fef7
commit 4ed56fca6e
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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>;
};
};

7
arch/arm/boot/dts/rk3288-veyron-mickey.dts
View File

@@ -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 {