Unverified Commit 8cbd7273 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: mt6358: Remove undefined HPx Mux enumeration values 



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: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230224-asoc-mt6358-quick-fixes-v1-3-747d9186be4b@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8e847a43

sound/soc/codecs/mt6358.c

+0 −6
Original line number Diff line number Diff line
@@ -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,