diff options
author | Mark Brown <broonie@kernel.org> | 2017-03-21 18:48:58 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-03-21 18:48:58 +0000 |
commit | 9e854388b0d7ed2d77578e2c01d5904c206ce3c7 (patch) | |
tree | faa7beee8092a05b8444a928105b3b4ccbc0b9a0 | |
parent | 9123aa8645463ca30ac8c62a07eb23e07c3aa091 (diff) | |
parent | eb3abaea7ea42619a48fa84e4b1ff48f1b18d863 (diff) | |
download | linux-9e854388b0d7ed2d77578e2c01d5904c206ce3c7.tar.bz2 |
Merge branch 'fix/sun8i' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sunxi
-rw-r--r-- | arch/arm/boot/dts/sun8i-a33.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index 18c174fef84f..0467fb365bfc 100644 --- a/arch/arm/boot/dts/sun8i-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a33.dtsi @@ -113,8 +113,8 @@ simple-audio-card,mclk-fs = <512>; simple-audio-card,aux-devs = <&codec_analog>; simple-audio-card,routing = - "Left DAC", "Digital Left DAC", - "Right DAC", "Digital Right DAC"; + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right"; status = "disabled"; simple-audio-card,cpu { |