ASoC: mt6358: Remove undefined HPx Mux enumeration values
authorMark Brown <broonie@kernel.org>
Sun, 26 Feb 2023 12:47:58 +0000 (12:47 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 28 Feb 2023 13:58:44 +0000 (13:58 +0000)
The HPx Mux enumerations define values 5, 6 and 7 but describe them as
"undefined" and map them to the value 0 on writing. Given the descriptions
and behaviour it seems that these values are invalid and should not be
present in the register, the current behaviour is detected as problematic
by mixer-test:

# # HPL Mux.0 expected 5 but read 0, is_volatile 0
# # HPL Mux.0 expected 6 but read 0, is_volatile 0
# # HPL Mux.0 expected 7 but read 0, is_volatile 0

Remove the values from the enumeration, this will prevent userspace setting
them.

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230224-asoc-mt6358-quick-fixes-v1-3-747d9186be4b@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/mt6358.c

index 89d0dcb2635b5c72fe0f04cf197f79bae63f567e..b54610b27906437b0ede084710fb6fc1d5007600 100644 (file)
@@ -637,9 +637,6 @@ static const char * const hp_in_mux_map[] = {
        "Audio Playback",
        "Test Mode",
        "HP Impedance",
-       "undefined1",
-       "undefined2",
-       "undefined3",
 };
 
 static int hp_in_mux_map_value[] = {
@@ -648,9 +645,6 @@ static int hp_in_mux_map_value[] = {
        HP_MUX_HP,
        HP_MUX_TEST_MODE,
        HP_MUX_HP_IMPEDANCE,
-       HP_MUX_OPEN,
-       HP_MUX_OPEN,
-       HP_MUX_OPEN,
 };
 
 static SOC_VALUE_ENUM_SINGLE_DECL(hpl_in_mux_map_enum,