Commit 9e854388 authored by Mark Brown's avatar Mark Brown

Merge branch 'fix/sun8i' of...

Merge branch 'fix/sun8i' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sunxi
parents 9123aa86 eb3abaea
...@@ -113,8 +113,8 @@ sound: sound { ...@@ -113,8 +113,8 @@ sound: sound {
simple-audio-card,mclk-fs = <512>; simple-audio-card,mclk-fs = <512>;
simple-audio-card,aux-devs = <&codec_analog>; simple-audio-card,aux-devs = <&codec_analog>;
simple-audio-card,routing = simple-audio-card,routing =
"Left DAC", "Digital Left DAC", "Left DAC", "AIF1 Slot 0 Left",
"Right DAC", "Digital Right DAC"; "Right DAC", "AIF1 Slot 0 Right";
status = "disabled"; status = "disabled";
simple-audio-card,cpu { simple-audio-card,cpu {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment