Skip to content

Commit 7584c6b

Browse files
marcanjannau
authored andcommitted
macaudio: Sync all gains with macOS
We want the extra headroom, and speakersafetyd seems to be reliable. 3dB lower gain isn't going to buy us much safety at this point. Signed-off-by: Hector Martin <marcan@marcan.st>
1 parent 30fb543 commit 7584c6b

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

sound/soc/apple/macaudio.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,42 +1470,42 @@ static const struct snd_soc_dapm_route macaudio_dapm_routes[] = {
14701470

14711471
/* enable amp speakers stereo gain safe_vol */
14721472
struct macaudio_platform_cfg macaudio_j180_cfg = {
1473-
false, AMP_SN012776, SPKR_1W1T, false, 4, -20,
1473+
false, AMP_SN012776, SPKR_1W1T, false, 10, -20,
14741474
};
14751475
struct macaudio_platform_cfg macaudio_j274_cfg = {
1476-
true, AMP_TAS5770, SPKR_1W, false, 14, 0, /* TODO: safety */
1476+
true, AMP_TAS5770, SPKR_1W, false, 20, -20,
14771477
};
14781478

14791479
struct macaudio_platform_cfg macaudio_j293_cfg = {
1480-
false, AMP_TAS5770, SPKR_2W, true, 9, -20, /* TODO: check */
1480+
false, AMP_TAS5770, SPKR_2W, true, 15, -20,
14811481
};
14821482

14831483
struct macaudio_platform_cfg macaudio_j313_cfg = {
14841484
true, AMP_TAS5770, SPKR_1W, true, 10, -20,
14851485
};
14861486

14871487
struct macaudio_platform_cfg macaudio_j314_j316_cfg = {
1488-
false, AMP_SN012776, SPKR_2W1T, true, 9, -20,
1488+
false, AMP_SN012776, SPKR_2W1T, true, 15, -20,
14891489
};
14901490

14911491
struct macaudio_platform_cfg macaudio_j37x_j47x_cfg = {
1492-
false, AMP_SN012776, SPKR_1W, false, 14, -20,
1492+
false, AMP_SN012776, SPKR_1W, false, 20, -20,
14931493
};
14941494

14951495
struct macaudio_platform_cfg macaudio_j413_cfg = {
1496-
false, AMP_SN012776, SPKR_1W1T, true, 9, -20,
1496+
false, AMP_SN012776, SPKR_1W1T, true, 15, -20,
14971497
};
14981498

14991499
struct macaudio_platform_cfg macaudio_j415_cfg = {
1500-
false, AMP_SN012776, SPKR_2W1T, true, 9, -20,
1500+
false, AMP_SN012776, SPKR_2W1T, true, 15, -20,
15011501
};
15021502

15031503
struct macaudio_platform_cfg macaudio_j45x_cfg = {
15041504
false, AMP_SSM3515, SPKR_1W1T, true, 9, -20, /* TODO: gain?? */
15051505
};
15061506

15071507
struct macaudio_platform_cfg macaudio_j493_cfg = {
1508-
false, AMP_SN012776, SPKR_2W, true, 9, -20,
1508+
false, AMP_SN012776, SPKR_2W, true, 15, -20,
15091509
};
15101510

15111511
struct macaudio_platform_cfg macaudio_fallback_cfg = {

0 commit comments

Comments
 (0)