Skip to content

Commit ab54a30

Browse files
committed
arm64: dts: apple: t600x-j314-j316: Set sound compatibles per device
j314 and j316 have different speakers, so should have different compatibles. In addition, j414 and j416 will include this config but should have their own compatibles. Move the compatibles to the individual device files. Signed-off-by: Hector Martin <marcan@marcan.st>
1 parent 0883686 commit ab54a30

5 files changed

Lines changed: 5 additions & 1 deletion

File tree

arch/arm64/boot/dts/apple/t6000-j314s.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@
3333
};
3434

3535
&sound {
36+
compatible = "apple,j314-macaudio", "apple,macaudio";
3637
model = "MacBook Pro J314";
3738
};

arch/arm64/boot/dts/apple/t6000-j316s.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@
3333
};
3434

3535
&sound {
36+
compatible = "apple,j316-macaudio", "apple,macaudio";
3637
model = "MacBook Pro J316";
3738
};

arch/arm64/boot/dts/apple/t6001-j314c.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@
3333
};
3434

3535
&sound {
36+
compatible = "apple,j314-macaudio", "apple,macaudio";
3637
model = "MacBook Pro J314";
3738
};

arch/arm64/boot/dts/apple/t6001-j316c.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@
3333
};
3434

3535
&sound {
36+
compatible = "apple,j316-macaudio", "apple,macaudio";
3637
model = "MacBook Pro J316";
3738
};

arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@
412412

413413
/ {
414414
sound: sound {
415-
compatible = "apple,j314-macaudio", "apple,macaudio";
415+
/* compatible is set per machine */
416416

417417
dai-link@0 {
418418
link-name = "Speakers";

0 commit comments

Comments
 (0)