diff options
| author | Mark Brown <broonie@kernel.org> | 2017-03-21 14:48:58 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-03-21 14:48:58 -0400 |
| commit | 9e854388b0d7ed2d77578e2c01d5904c206ce3c7 (patch) | |
| tree | faa7beee8092a05b8444a928105b3b4ccbc0b9a0 | |
| parent | 9123aa8645463ca30ac8c62a07eb23e07c3aa091 (diff) | |
| parent | eb3abaea7ea42619a48fa84e4b1ff48f1b18d863 (diff) | |
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 @@ | |||
| 113 | simple-audio-card,mclk-fs = <512>; | 113 | simple-audio-card,mclk-fs = <512>; |
| 114 | simple-audio-card,aux-devs = <&codec_analog>; | 114 | simple-audio-card,aux-devs = <&codec_analog>; |
| 115 | simple-audio-card,routing = | 115 | simple-audio-card,routing = |
| 116 | "Left DAC", "Digital Left DAC", | 116 | "Left DAC", "AIF1 Slot 0 Left", |
| 117 | "Right DAC", "Digital Right DAC"; | 117 | "Right DAC", "AIF1 Slot 0 Right"; |
| 118 | status = "disabled"; | 118 | status = "disabled"; |
| 119 | 119 | ||
| 120 | simple-audio-card,cpu { | 120 | simple-audio-card,cpu { |