diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-04-10 17:12:01 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-04-10 17:12:01 +0200 |
| commit | ff21b250e9b842140dee4b8c464f426fa2b09f8b (patch) | |
| tree | ee512528bc829ae07b05c8437aadc210d4b872a1 /arch | |
| parent | 1f9d3d98694b1cef93f99a54e6830e9717616ba6 (diff) | |
| parent | 3d016d57fdc5e6caa4cd67896f4b081bccad6e2c (diff) | |
| download | op-kernel-dev-ff21b250e9b842140dee4b8c464f426fa2b09f8b.zip op-kernel-dev-ff21b250e9b842140dee4b8c464f426fa2b09f8b.tar.gz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'arch')
| -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 18c174f..0467fb3 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 { |
