Skip to content

Commit be7f32b

Browse files
marcanjannau
authored andcommitted
macaudio: Enable VSENSE switches
Signed-off-by: Hector Martin <marcan@marcan.st>
1 parent 9fe9a85 commit be7f32b

1 file changed

Lines changed: 0 additions & 20 deletions

File tree

sound/soc/apple/macaudio.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,15 +1139,6 @@ static int macaudio_j313_fixup_controls(struct snd_soc_card *card) {
11391139
*/
11401140
CHECK(snd_soc_limit_volume, "* Amp Gain Volume", 14);
11411141

1142-
/*
1143-
* Since we don't set the right slots yet to avoid
1144-
* driver conflict on the I2S bus sending ISENSE/VSENSE
1145-
* samples from the codecs back to us, disable the
1146-
* controls.
1147-
*/
1148-
CHECK(snd_soc_deactivate_kctl, "* VSENSE Switch", 0);
1149-
CHECK(snd_soc_deactivate_kctl, "* ISENSE Switch", 0);
1150-
11511142
macaudio_vlimit_update(ma);
11521143
}
11531144

@@ -1176,17 +1167,6 @@ static int macaudio_j314_fixup_controls(struct snd_soc_card *card)
11761167
CHECK(snd_soc_set_enum_kctl, "* OCE Handling", "Retry");
11771168
CHECK(snd_soc_deactivate_kctl, "* OCE Handling", 0);
11781169

1179-
/*
1180-
* Since we don't set the right slots yet to avoid
1181-
* driver conflict on the I2S bus sending ISENSE/VSENSE
1182-
* samples from the codecs back to us, disable the
1183-
* controls.
1184-
*/
1185-
#if 0
1186-
CHECK(snd_soc_deactivate_kctl, "* VSENSE Switch", 0);
1187-
CHECK(snd_soc_deactivate_kctl, "* ISENSE Switch", 0);
1188-
#endif
1189-
11901170
macaudio_vlimit_update(ma);
11911171
}
11921172

0 commit comments

Comments
 (0)