ASoC: CX20442: simplify codec controller usage

This patch is a workaround for the problem of several subsequent control
statements not being applied correctly to the codec controller (modem).

In order to follow the hook switch state change from handset to handsfree
while
in full duplex mode, two consecutive +VLS control commands were sent to the
modem. The first one was M1 (microphone only), the seconds one was M1S1 (both
microphone and speaker). As there was no real modem handshaking procedure
implemented, neither in the codec nor in the machine driver part of the line
discipline, the modem was having the second command missed.

Since a possibility to switch to microphone only mode (and speaker only mode
as well) seams of no value, I have modified the code to issue single M1S1
command only for any of those cases.

Tested on my Amstrad Delta.

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index 0e54adcc97956253582a6923d448a5a48a9acdc9..38eac9c866e1627a60350d9e9e3a0cc78d28a664 100644 (file)
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -138,9 +138,7 @@ static int cx20442_pm_to_v253_vls(u8 value)
        case 0:
                return V253_VLS_T;
        case (1 << CX20442_SPKOUT):
-               return V253_VLS_S1;
        case (1 << CX20442_MIC):
-               return V253_VLS_M1;
        case (1 << CX20442_SPKOUT) | (1 << CX20442_MIC):
                return V253_VLS_M1S1;
        case (1 << CX20442_TELOUT):