git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
renesas
/
r8a7796-salvator-xs.dts
diff --git
a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts
b/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts
index d58ede18108d1accbd7d5b538dd719cec34ee305..a1cbfef2053fe40812258a96ac75f3a649a9fe48 100644
(file)
--- a/
arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts
+++ b/
arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts
@@
-36,11
+36,6
@@
"dclkin.0", "dclkin.1", "dclkin.2";
};
-&sound_card {
- dais = <&rsnd_port0 /* ak4613 */
- &rsnd_port1>; /* HDMI0 */
-};
-
&hdmi0 {
status = "okay";
@@
-81,3
+76,8
@@
};
};
};
+
+&sound_card {
+ dais = <&rsnd_port0 /* ak4613 */
+ &rsnd_port1>; /* HDMI0 */
+};