Skip to contentSkip to conversation

ASOC: Intel: sof_sdw: add quirk for Intel 'Rooks County' NUC M15

PATCH In review Sasha Levin 2 participants 4 messages Apr 20, 2023 – May 10, 2023

Subsystems (2)
Stable branch IIO
lore
Share & tools
lore

Sasha Levin

author maintainer
#0 lore raw

PATCH 1/3 ASOC: Intel: sof_sdw: add quirk for Intel 'Rooks County' NUC M15

From: Eugene Huang <[email protected]>

[ Upstream commit 3c728b1bc5b99c5275ac5c7788ef814c0e51ef54 ]

Same quirks as the 'Bishop County' NUC M15, except the rt711 is in the 'JD2 100K' jack detection mode.

Link https://github.com/thesofproject/linux/issues/4088
Signed-off-by Eugene Huang <[email protected]>
Reviewed-by Pierre-Louis Bossart <[email protected]>
Reviewed-by Péter Ujfalusi <[email protected]>
Signed-off-by Bard Liao <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Mark Brown <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
---
 sound/soc/intel/boards/sof_sdw.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
sound/soc/intel/boards/sof_sdw.c +11 -0
index f5d8f7951cfc3..eb713e9c2bd22 100644
@@ -175,6 +175,17 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
 					SOF_SDW_PCH_DMIC |
 					SOF_RT711_JD_SRC_JD2),
 	},
+	{
+		/* NUC15 'Rooks County' LAPRC510 and LAPRC710 skews */
+		.callback = sof_sdw_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "LAPRC"),
+		},
+		.driver_data = (void *)(SOF_SDW_TGL_HDMI |
+					SOF_SDW_PCH_DMIC |
+					RT711_JD2_100K),
+	},
 	/* TigerLake-SDCA devices */
 	{
 		.callback = sof_sdw_quirk_cb,
Signature · 1 line
2.39.2
author maintainer
#1 lore raw

PATCH 2/3 iio: adc: palmas_gpadc: fix NULL dereference on rmmod

From: Patrik Dahlström <[email protected]>

[ Upstream commit 49f76c499d38bf67803438eee88c8300d0f6ce09 ]

Calling dev_to_iio_dev() on a platform device pointer is undefined and will make adc NULL.

Signed-off-by Patrik Dahlström <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Jonathan Cameron <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
---
 drivers/iio/adc/palmas_gpadc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/palmas_gpadc.c +1 -1
index f4756671cddb6..6ed0d151ad21a 100644
@@ -628,7 +628,7 @@ static int palmas_gpadc_probe(struct platform_device *pdev)
 
 static int palmas_gpadc_remove(struct platform_device *pdev)
 {
-	struct iio_dev *indio_dev = dev_to_iio_dev(&pdev->dev);
+	struct iio_dev *indio_dev = dev_get_drvdata(&pdev->dev);
 	struct palmas_gpadc *adc = iio_priv(indio_dev);
 
 	if (adc->wakeup1_enable || adc->wakeup2_enable)
Signature · 1 line
2.39.2
author maintainer
#2 lore raw

PATCH 3/3 ASoC: Intel: bytcr_rt5640: Add quirk for the Acer Iconia One 7 B1-750

In reply to Sasha Levin

From: Hans de Goede <[email protected]>

[ Upstream commit e38c5e80c3d293a883c6f1d553f2146ec0bda35e ]

The Acer Iconia One 7 B1-750 tablet mostly works fine with the defaults for an Bay Trail CR tablet. Except for the internal mic, instead of an analog mic on IN3 a digital mic on DMIC1 is uses.

Add a quirk with these settings for this tablet.

Acked-by Pierre-Louis Bossart <[email protected]>
Signed-off-by Hans de Goede <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Mark Brown <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
---
 sound/soc/intel/boards/bytcr_rt5640.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
sound/soc/intel/boards/bytcr_rt5640.c +12 -0
index 8a99cb6dfcd69..9a5ab96f917d3 100644
@@ -393,6 +393,18 @@ static int byt_rt5640_aif1_hw_params(struct snd_pcm_substream *substream,
 
 /* Please keep this list alphabetically sorted */
 static const struct dmi_system_id byt_rt5640_quirk_table[] = {
+	{	/* Acer Iconia One 7 B1-750 */
+		.matches = {
+			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Insyde"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "VESPA2"),
+		},
+		.driver_data = (void *)(BYT_RT5640_DMIC1_MAP |
+					BYT_RT5640_JD_SRC_JD1_IN4P |
+					BYT_RT5640_OVCD_TH_1500UA |
+					BYT_RT5640_OVCD_SF_0P75 |
+					BYT_RT5640_SSP0_AIF1 |
+					BYT_RT5640_MCLK_EN),
+	},
 	{	/* Acer Iconia Tab 8 W1-810 */
 		.matches = {
 			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Acer"),
Signature · 1 line
2.39.2
#3 lore raw
In reply to Sasha Levin

Hi Sasha,

Quoted 43 lines · Sasha Levin

From: Eugene Huang <[email protected]>

[ Upstream commit 3c728b1bc5b99c5275ac5c7788ef814c0e51ef54 ]

Same quirks as the 'Bishop County' NUC M15, except the rt711 is in the 'JD2 100K' jack detection mode.

Link https://github.com/thesofproject/linux/issues/4088
Signed-off-by Eugene Huang <[email protected]>
Reviewed-by Pierre-Louis Bossart <[email protected]>
Reviewed-by Péter Ujfalusi <[email protected]>
Signed-off-by Bard Liao <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Mark Brown <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
---
 sound/soc/intel/boards/sof_sdw.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
sound/soc/intel/boards/sof_sdw.c +11 -0
index f5d8f7951cfc3..eb713e9c2bd22 100644
@@ -175,6 +175,17 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
 					SOF_SDW_PCH_DMIC |
 					SOF_RT711_JD_SRC_JD2),
 	},
+	{
+		/* NUC15 'Rooks County' LAPRC510 and LAPRC710 skews */
+		.callback = sof_sdw_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "LAPRC"),
+		},
+		.driver_data = (void *)(SOF_SDW_TGL_HDMI |
+					SOF_SDW_PCH_DMIC |
+					RT711_JD2_100K),
+	},
 	/* TigerLake-SDCA devices */
 	{
 		.callback = sof_sdw_quirk_cb,
Signature · 1 line
2.39.2

Is this correct that this can be picked for 5.10.y? I did (by mistake) AFAICS this is in 5.10.180-rc1, and building leads to:

sound/soc/intel/boards/sof_sdw.c:187:6: error: ‘RT711_JD2_100K’ undeclared here (not in a function)

  187 |      RT711_JD2_100K),
      |      ^~~~~~~~~~~~~~

make[7]: *** [scripts/Makefile.build:286: sound/soc/intel/boards/sof_sdw.o] Error 1 make[6]: *** [scripts/Makefile.build:503: sound/soc/intel/boards] Error 2 make[5]: *** [scripts/Makefile.build:503: sound/soc/intel] Error 2 make[4]: *** [scripts/Makefile.build:503: sound/soc] Error 2

Regards,
Salvatore