[PATCH 0/2] ASoC: Intel: sof_sdw: fix two settings
Fix button mapping for CS42L42 and jack detection for LunarLake RVP.
Pierre-Louis Bossart (1): ASoC: Intel: sof-sdw: update jack detection quirk for LunarLake RVP
jairaj-arava (1): ASoC: Intel: sof-sdw-cs42142: fix for codec button mapping
sound/soc/intel/boards/sof_sdw.c | 2 +- sound/soc/intel/boards/sof_sdw_cs42l42.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
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(-)
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);
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.
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.
Experimental results show that the headset is only detected with the JD2 quirk.
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Reviewed-by: Bard Liao yung-chuan.liao@linux.intel.com Reviewed-by: Ranjani Sridharan ranjani.sridharan@linux.intel.com --- sound/soc/intel/boards/sof_sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index f283c0d528df..5a1c750e6ae6 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -488,7 +488,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), DMI_MATCH(DMI_PRODUCT_NAME, "Lunar Lake Client Platform"), }, - .driver_data = (void *)(RT711_JD2_100K), + .driver_data = (void *)(RT711_JD2), }, {} };
On Mon, 07 Aug 2023 16:49:58 -0500, Pierre-Louis Bossart wrote:
Fix button mapping for CS42L42 and jack detection for LunarLake RVP.
Pierre-Louis Bossart (1): ASoC: Intel: sof-sdw: update jack detection quirk for LunarLake RVP
jairaj-arava (1): ASoC: Intel: sof-sdw-cs42142: fix for codec button mapping
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: Intel: sof-sdw-cs42142: fix for codec button mapping commit: e61994882611d1a49387be37fda005e0ef6226ac [2/2] ASoC: Intel: sof-sdw: update jack detection quirk for LunarLake RVP commit: bd76caa26ab53ed3bf13ad541d69f119e910d764
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
participants (2)
-
Mark Brown -
Pierre-Louis Bossart