| Message ID | 20221025140942.509066-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8bb0ac0e6f64ebdf15d963c26b028de391c9bcf9 |
| Headers | show |
| Series | ASoC: Intel: bytcht_es8316: Add quirk for the Nanote UMPC-01 | expand |
On 10/25/22 09:09, Hans de Goede wrote: > The Nanote UMPC-01 mini laptop has stereo speakers, while the default > bytcht_es8316 settings assume a mono speaker setup. Add a quirk for this. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > sound/soc/intel/boards/bytcht_es8316.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c > index 6432b83f616f..a935c5fd9edb 100644 > --- a/sound/soc/intel/boards/bytcht_es8316.c > +++ b/sound/soc/intel/boards/bytcht_es8316.c > @@ -443,6 +443,13 @@ static const struct dmi_system_id byt_cht_es8316_quirk_table[] = { > | BYT_CHT_ES8316_INTMIC_IN2_MAP > | BYT_CHT_ES8316_JD_INVERTED), > }, > + { /* Nanote UMPC-01 */ > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "RWC CO.,LTD"), > + DMI_MATCH(DMI_PRODUCT_NAME, "UMPC-01"), > + }, > + .driver_data = (void *)BYT_CHT_ES8316_INTMIC_IN1_MAP, the commit massage talks about a mono speaker, this quirk changes the microphone setup. Is the quirk correct? > + }, > { /* Teclast X98 Plus II */ > .matches = { > DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"),
Hi, On 10/25/22 16:29, Pierre-Louis Bossart wrote: > > > On 10/25/22 09:09, Hans de Goede wrote: >> The Nanote UMPC-01 mini laptop has stereo speakers, while the default >> bytcht_es8316 settings assume a mono speaker setup. Add a quirk for this. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> sound/soc/intel/boards/bytcht_es8316.c | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c >> index 6432b83f616f..a935c5fd9edb 100644 >> --- a/sound/soc/intel/boards/bytcht_es8316.c >> +++ b/sound/soc/intel/boards/bytcht_es8316.c >> @@ -443,6 +443,13 @@ static const struct dmi_system_id byt_cht_es8316_quirk_table[] = { >> | BYT_CHT_ES8316_INTMIC_IN2_MAP >> | BYT_CHT_ES8316_JD_INVERTED), >> }, >> + { /* Nanote UMPC-01 */ >> + .matches = { >> + DMI_MATCH(DMI_SYS_VENDOR, "RWC CO.,LTD"), >> + DMI_MATCH(DMI_PRODUCT_NAME, "UMPC-01"), >> + }, >> + .driver_data = (void *)BYT_CHT_ES8316_INTMIC_IN1_MAP, > > the commit massage talks about a mono speaker, this quirk changes the > microphone setup. Is the quirk correct? The default quirk for a CHT es8316 codec using device is: } else { /* Others default to internal-mic-in1-map, mono-speaker */ quirk = BYT_CHT_ES8316_INTMIC_IN1_MAP | BYT_CHT_ES8316_MONO_SPEAKER; } So this just drops the BYT_CHT_ES8316_MONO_SPEAKER from the default quirks. Yes defaulting to mono is a bit weird, but the es8316 is mostly used in very low budget devices which often have only 1 speaker. Regards, Hans > >> + }, >> { /* Teclast X98 Plus II */ >> .matches = { >> DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"), >
On 10/25/22 10:22, Hans de Goede wrote: > Hi, > > On 10/25/22 16:29, Pierre-Louis Bossart wrote: >> >> >> On 10/25/22 09:09, Hans de Goede wrote: >>> The Nanote UMPC-01 mini laptop has stereo speakers, while the default >>> bytcht_es8316 settings assume a mono speaker setup. Add a quirk for this. >>> >>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >>> --- >>> sound/soc/intel/boards/bytcht_es8316.c | 7 +++++++ >>> 1 file changed, 7 insertions(+) >>> >>> diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c >>> index 6432b83f616f..a935c5fd9edb 100644 >>> --- a/sound/soc/intel/boards/bytcht_es8316.c >>> +++ b/sound/soc/intel/boards/bytcht_es8316.c >>> @@ -443,6 +443,13 @@ static const struct dmi_system_id byt_cht_es8316_quirk_table[] = { >>> | BYT_CHT_ES8316_INTMIC_IN2_MAP >>> | BYT_CHT_ES8316_JD_INVERTED), >>> }, >>> + { /* Nanote UMPC-01 */ >>> + .matches = { >>> + DMI_MATCH(DMI_SYS_VENDOR, "RWC CO.,LTD"), >>> + DMI_MATCH(DMI_PRODUCT_NAME, "UMPC-01"), >>> + }, >>> + .driver_data = (void *)BYT_CHT_ES8316_INTMIC_IN1_MAP, >> >> the commit massage talks about a mono speaker, this quirk changes the >> microphone setup. Is the quirk correct? > > The default quirk for a CHT es8316 codec using device is: > > } else { > /* Others default to internal-mic-in1-map, mono-speaker */ > quirk = BYT_CHT_ES8316_INTMIC_IN1_MAP | > BYT_CHT_ES8316_MONO_SPEAKER; > } > > So this just drops the BYT_CHT_ES8316_MONO_SPEAKER from the default quirks. > > Yes defaulting to mono is a bit weird, but the es8316 is mostly > used in very low budget devices which often have only 1 speaker. Yes, I read this sideways - need more coffee. Thanks Hans! Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
On Tue, 25 Oct 2022 16:09:42 +0200, Hans de Goede wrote: > The Nanote UMPC-01 mini laptop has stereo speakers, while the default > bytcht_es8316 settings assume a mono speaker setup. Add a quirk for this. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: Intel: bytcht_es8316: Add quirk for the Nanote UMPC-01 commit: 8bb0ac0e6f64ebdf15d963c26b028de391c9bcf9 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
diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 6432b83f616f..a935c5fd9edb 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -443,6 +443,13 @@ static const struct dmi_system_id byt_cht_es8316_quirk_table[] = { | BYT_CHT_ES8316_INTMIC_IN2_MAP | BYT_CHT_ES8316_JD_INVERTED), }, + { /* Nanote UMPC-01 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "RWC CO.,LTD"), + DMI_MATCH(DMI_PRODUCT_NAME, "UMPC-01"), + }, + .driver_data = (void *)BYT_CHT_ES8316_INTMIC_IN1_MAP, + }, { /* Teclast X98 Plus II */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"),
The Nanote UMPC-01 mini laptop has stereo speakers, while the default bytcht_es8316 settings assume a mono speaker setup. Add a quirk for this. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- sound/soc/intel/boards/bytcht_es8316.c | 7 +++++++ 1 file changed, 7 insertions(+)