diff mbox series

[1/2] ASoC: Intel: sof-sdw-cs42142: fix for codec button mapping

Message ID 20230807215000.515846-2-pierre-louis.bossart@linux.intel.com (mailing list archive)
State Accepted
Commit e61994882611d1a49387be37fda005e0ef6226ac
Headers show
Series ASoC: Intel: sof_sdw: fix two settings | expand

Commit Message

Pierre-Louis Bossart Aug. 7, 2023, 9:49 p.m. UTC
From: jairaj-arava <jairaj.arava@intel.com>

The CS42142 soundwire codec button mapping is corrected to
handle the button detection correctly.

Fixes: 1340018d8683 ("ASoC: Intel: sof_sdw: Add helper function for cs42l42 codec")
Signed-off-by: jairaj-arava <jairaj.arava@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 sound/soc/intel/boards/sof_sdw_cs42l42.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Mark Brown Aug. 7, 2023, 10:11 p.m. UTC | #1
On Mon, Aug 07, 2023 at 04:49:59PM -0500, Pierre-Louis Bossart wrote:
> From: jairaj-arava <jairaj.arava@intel.com>
> 
> The CS42142 soundwire codec button mapping is corrected to
> handle the button detection correctly.
> 
> Fixes: 1340018d8683 ("ASoC: Intel: sof_sdw: Add helper function for cs42l42 codec")

Sorry, it's this one with the incorrect ID - you've referenced something
from the SOF tree I guess.  I'll fix it up.
Pierre-Louis Bossart Aug. 8, 2023, 2:48 p.m. UTC | #2
On 8/7/23 17:11, Mark Brown wrote:
> On Mon, Aug 07, 2023 at 04:49:59PM -0500, Pierre-Louis Bossart wrote:
>> From: jairaj-arava <jairaj.arava@intel.com>
>>
>> The CS42142 soundwire codec button mapping is corrected to
>> handle the button detection correctly.
>>
>> Fixes: 1340018d8683 ("ASoC: Intel: sof_sdw: Add helper function for cs42l42 codec")
> 
> Sorry, it's this one with the incorrect ID - you've referenced something
> from the SOF tree I guess.  I'll fix it up.

Indeed, sorry about this one. I took Jai's patch after a long set of
rebases and didn't check the commit ID. oops.
diff mbox series

Patch

diff --git a/sound/soc/intel/boards/sof_sdw_cs42l42.c b/sound/soc/intel/boards/sof_sdw_cs42l42.c
index c4a16e4c9f69..ad130d913415 100644
--- a/sound/soc/intel/boards/sof_sdw_cs42l42.c
+++ b/sound/soc/intel/boards/sof_sdw_cs42l42.c
@@ -99,9 +99,9 @@  static int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd)
 	jack = &ctx->sdw_headset;
 
 	snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);
-	snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);
-	snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
-	snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
+	snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP);
+	snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN);
+	snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);
 
 	ret = snd_soc_component_set_jack(component, jack, NULL);