On 9/23/2020 4:34 PM, Jaroslav Kysela wrote:
Dne 23. 09. 20 v 10:05 Kai Vehmanen napsal(a):
From: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
Somehow for this codec we never used any prefix for the controls, likely because the test platform has a single SoundWire device.
Follow the convention and use the codec prefix across the board to avoid possible conflicts.
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Reviewed-by: Bard Liao yung-chuan.liao@linux.intel.com Reviewed-by: Guennadi Liakhovetski guennadi.liakhovetski@linux.intel.com Signed-off-by: Kai Vehmanen kai.vehmanen@linux.intel.com
sound/soc/intel/boards/sof_sdw_rt700.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/intel/boards/sof_sdw_rt700.c b/sound/soc/intel/boards/sof_sdw_rt700.c index bff69cfe27f4..21e7e4a81779 100644 --- a/sound/soc/intel/boards/sof_sdw_rt700.c +++ b/sound/soc/intel/boards/sof_sdw_rt700.c @@ -23,9 +23,9 @@ static const struct snd_soc_dapm_widget rt700_widgets[] = {
static const struct snd_soc_dapm_route rt700_map[] = { /* Headphones */
- { "Headphones", NULL, "HP" },
- { "Speaker", NULL, "SPK" },
- { "MIC2", NULL, "AMIC" },
- { "Headphones", NULL, "rt700 HP" },
- { "Speaker", NULL, "rt700 SPK" },
- { "rt700 MIC2", NULL, "AMIC" },
This line looks suspicious. Perhaps, the prefix should be added before AMIC ?
The "rt700" is a prefix for rt700 codec and the "MIC2" is one of rt700's
widget and "AMIC" is machine driver's widget. So "rt700 MIC2" looks correct
to me.
Jaroslav