Merge tag 'sti-dt-for-v4.20-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt

STi DT update:
 _ Change syntax of multiple DAI links

* tag 'sti-dt-for-v4.20-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  ARM: dts: stih410: change syntax of multiple DAI

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2018-09-25 13:40:44 -07:00
2 changed files with 12 additions and 4 deletions

View File

@@ -61,8 +61,11 @@
compatible = "simple-audio-card";
simple-audio-card,name = "STI-B2260";
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
simple-audio-card,dai-link0 {
simple-audio-card,dai-link@0 {
reg = <0>;
/* DAC */
format = "i2s";
mclk-fs = <128>;

View File

@@ -27,8 +27,11 @@
compatible = "simple-audio-card";
simple-audio-card,name = "STI-B2120";
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
simple-audio-card,dai-link0 {
simple-audio-card,dai-link@0 {
reg = <0>;
/* HDMI */
format = "i2s";
mclk-fs = <128>;
@@ -41,7 +44,8 @@
};
};
simple-audio-card,dai-link1 {
simple-audio-card,dai-link@1 {
reg = <1>;
/* DAC */
format = "i2s";
mclk-fs = <256>;
@@ -55,7 +59,8 @@
};
};
simple-audio-card,dai-link2 {
simple-audio-card,dai-link@2 {
reg = <2>;
/* SPDIF */
format = "left_j";
mclk-fs = <128>;