diff options
| author | Olof Johansson <olof@lixom.net> | 2019-11-10 21:27:32 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-11-10 21:27:34 -0800 |
| commit | 4ed56fca6ea1d23d79e46233afc431c2f05e1a70 (patch) | |
| tree | 1d4de327a256699628e0d13e5aa5bd789a45c960 /arch/arm/boot/dts | |
| parent | 7c3ddc6b038feaa9a05b09c3f20e64fed50f9a3f (diff) | |
| parent | bbf8f6fef71a02b297de532364b5217d34f01582 (diff) | |
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@phil
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3288-veyron-mickey.dts | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi b/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi index 445270aa136e..51208d161d65 100644 --- a/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi @@ -17,6 +17,7 @@ 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>; }; }; diff --git a/arch/arm/boot/dts/rk3288-veyron-mickey.dts b/arch/arm/boot/dts/rk3288-veyron-mickey.dts index aa352d40c991..06a6a9554c48 100644 --- a/arch/arm/boot/dts/rk3288-veyron-mickey.dts +++ b/arch/arm/boot/dts/rk3288-veyron-mickey.dts @@ -28,6 +28,13 @@ 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 { |