Skip to content

Commit 277f972

Browse files
marcanjannau
authored andcommitted
READ COMMIT MESSAGE! macaudio: Enable first round of models
Enables j313, j293, j493, j314, j414, j274, j375, j473, j474, j475 *** WARNING FOR DISTRO PACKAGERS WANTING TO APPLY THIS: *** *** YOU ABSOLUTELY NEED THIS PATCH IN YOUR LSP-PLUGINS PACKAGE *** lsp-plugins/lsp-dsp-lib#20 Do NOT enable speakers without that patch, on any model. It can/will result in nasty noise that could damage them. Signed-off-by: Hector Martin <marcan@marcan.st>
1 parent e5e3448 commit 277f972

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

sound/soc/apple/macaudio.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,23 +1490,27 @@ struct macaudio_platform_cfg macaudio_j180_cfg = {
14901490
false, AMP_SN012776, SPKR_1W1T, false, 10, -20,
14911491
};
14921492
struct macaudio_platform_cfg macaudio_j274_cfg = {
1493-
false, AMP_TAS5770, SPKR_1W, false, 20, -20,
1493+
true, AMP_TAS5770, SPKR_1W, false, 20, -20,
14941494
};
14951495

14961496
struct macaudio_platform_cfg macaudio_j293_cfg = {
1497-
false, AMP_TAS5770, SPKR_2W, true, 15, -20,
1497+
true, AMP_TAS5770, SPKR_2W, true, 15, -20,
14981498
};
14991499

15001500
struct macaudio_platform_cfg macaudio_j313_cfg = {
1501-
false, AMP_TAS5770, SPKR_1W, true, 10, -20,
1501+
true, AMP_TAS5770, SPKR_1W, true, 10, -20,
15021502
};
15031503

1504-
struct macaudio_platform_cfg macaudio_j314_j316_cfg = {
1504+
struct macaudio_platform_cfg macaudio_j314_cfg = {
1505+
true, AMP_SN012776, SPKR_2W1T, true, 15, -20,
1506+
};
1507+
1508+
struct macaudio_platform_cfg macaudio_j316_cfg = {
15051509
false, AMP_SN012776, SPKR_2W1T, true, 15, -20,
15061510
};
15071511

15081512
struct macaudio_platform_cfg macaudio_j37x_j47x_cfg = {
1509-
false, AMP_SN012776, SPKR_1W, false, 20, -20,
1513+
true, AMP_SN012776, SPKR_1W, false, 20, -20,
15101514
};
15111515

15121516
struct macaudio_platform_cfg macaudio_j413_cfg = {
@@ -1522,7 +1526,7 @@ struct macaudio_platform_cfg macaudio_j45x_cfg = {
15221526
};
15231527

15241528
struct macaudio_platform_cfg macaudio_j493_cfg = {
1525-
false, AMP_SN012776, SPKR_2W, true, 15, -20,
1529+
true, AMP_SN012776, SPKR_2W, true, 15, -20,
15261530
};
15271531

15281532
struct macaudio_platform_cfg macaudio_fallback_cfg = {
@@ -1558,9 +1562,9 @@ static const struct of_device_id macaudio_snd_device_id[] = {
15581562
/* j313 AID4 tas5770 10 2× 1W */
15591563
{ .compatible = "apple,j313-macaudio", .data = &macaudio_j313_cfg },
15601564
/* j314 AID8 sn012776 15 2× 2W+1T */
1561-
{ .compatible = "apple,j314-macaudio", .data = &macaudio_j314_j316_cfg },
1565+
{ .compatible = "apple,j314-macaudio", .data = &macaudio_j314_cfg },
15621566
/* j316 AID9 sn012776 15 2× 2W+1T */
1563-
{ .compatible = "apple,j316-macaudio", .data = &macaudio_j314_j316_cfg },
1567+
{ .compatible = "apple,j316-macaudio", .data = &macaudio_j316_cfg },
15641568
/* j375 AID10 sn012776 15 1× 1W */
15651569
{ .compatible = "apple,j375-macaudio", .data = &macaudio_j37x_j47x_cfg },
15661570
/* j413 AID13 sn012776 15 2× 1W+1T */

0 commit comments

Comments
 (0)