diff options
| author |  Mark Brown <broonie@kernel.org>
| 2023-08-10 00:19:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org>
| 2023-08-10 00:19:02 +0100 |
| commit | 81113108491edc277d61337ea410c5f89d85faa3 (patch) | |
| tree | 2bce8a3c2bd7ad8bd46674cd34ddde5ba1073417 /sound/soc/intel | |
| parent | ASoC: cs35l56: Bugfixes (diff) | |
| parent | ASoC: SOF: ipc4-topology: Update the basecfg for copier earlier (diff) | |
| download | linux-81113108491edc277d61337ea410c5f89d85faa3.tar.gz linux-81113108491edc277d61337ea410c5f89d85faa3.tar.bz2 linux-81113108491edc277d61337ea410c5f89d85faa3.zip | |
ASoC: Merge up fixes
For the benefit of CI
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/boards/sof_sdw.c | 2 | ||||
| -rw-r--r-- | sound/soc/intel/boards/sof_sdw_cs42l42.c | 6 |
2 files changed, 4 insertions, 4 deletions
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), }, {} }; 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); |