Unverified Commit 7d25f7ca authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: Intel: bytcr_rt5640: Add quirks for 4 more tablet / 2-in-1... 

Merge series "ASoC: Intel: bytcr_rt5640: Add quirks for 4 more tablet / 2-in-1 models" from Hans de Goede <hdegoede@redhat.com>:

Hi All,

Here is a patch series adding quirks with device-specific settings for
4 more tablet / 2-in-1 models.

Regards,

Hans

Hans de Goede (4):
  ASoC: Intel: bytcr_rt5640: Add quirk for the Estar Beauty HD MID 7316R tablet
  ASoC: Intel: bytcr_rt5640: Add quirk for the Voyo Winpad A15 tablet
  ASoC: Intel: bytcr_rt5651: Add quirk for the Jumper EZpad 7 tablet
  ASoC: Intel: bytcr_rt5640: Add quirk for the Acer One S1002 tablet

 sound/soc/intel/boards/bytcr_rt5640.c | 37 +++++++++++++++++++++++++++
 sound/soc/intel/boards/bytcr_rt5651.c | 13 ++++++++++
 2 files changed, 50 insertions(+)

--
2.30.1
parents 8a353d7b c58947af

sound/soc/intel/boards/bytcr_rt5640.c

+37 −0
Original line number Diff line number Diff line
@@ -406,6 +406,19 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { 
					BYT_RT5640_SSP0_AIF1 |

					BYT_RT5640_MCLK_EN),

	},

	{	/* Acer One 10 S1002 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

			DMI_MATCH(DMI_PRODUCT_NAME, "One S1002"),

		},

		.driver_data = (void *)(BYT_RT5640_IN1_MAP |

					BYT_RT5640_JD_SRC_JD2_IN4N |

					BYT_RT5640_OVCD_TH_2000UA |

					BYT_RT5640_OVCD_SF_0P75 |

					BYT_RT5640_DIFF_MIC |

					BYT_RT5640_SSP0_AIF2 |

					BYT_RT5640_MCLK_EN),

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
@@ -531,6 +544,16 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { 
					BYT_RT5640_MONO_SPEAKER |

					BYT_RT5640_MCLK_EN),

	},

	{	/* Estar Beauty HD MID 7316R */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Estar"),

			DMI_MATCH(DMI_PRODUCT_NAME, "eSTAR BEAUTY HD Intel Quad core"),

		},

		.driver_data = (void *)(BYTCR_INPUT_DEFAULTS |

					BYT_RT5640_MONO_SPEAKER |

					BYT_RT5640_SSP0_AIF1 |

					BYT_RT5640_MCLK_EN),

	},

	{

		.matches = {

			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
@@ -814,6 +837,20 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { 
					BYT_RT5640_SSP0_AIF2 |

					BYT_RT5640_MCLK_EN),

	},

	{	/* Voyo Winpad A15 */

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),

			DMI_MATCH(DMI_BOARD_NAME, "Aptio CRB"),

			/* Above strings are too generic, also match on BIOS date */

			DMI_MATCH(DMI_BIOS_DATE, "11/20/2014"),

		},

		.driver_data = (void *)(BYT_RT5640_IN1_MAP |

					BYT_RT5640_JD_SRC_JD2_IN4N |

					BYT_RT5640_OVCD_TH_2000UA |

					BYT_RT5640_OVCD_SF_0P75 |

					BYT_RT5640_DIFF_MIC |

					BYT_RT5640_MCLK_EN),

	},

	{	/* Catch-all for generic Insyde tablets, must be last */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),

sound/soc/intel/boards/bytcr_rt5651.c

+13 −0
Original line number Diff line number Diff line
@@ -435,6 +435,19 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = { 
					BYT_RT5651_SSP0_AIF1 |

					BYT_RT5651_MONO_SPEAKER),

	},

	{

		/* Jumper EZpad 7 */

		.callback = byt_rt5651_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Jumper"),

			DMI_MATCH(DMI_PRODUCT_NAME, "EZpad"),

			/* Jumper12x.WJ2012.bsBKRCP05 with the version dropped */

			DMI_MATCH(DMI_BIOS_VERSION, "Jumper12x.WJ2012.bsBKRCP"),

		},

		.driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS |

					BYT_RT5651_IN2_MAP |

					BYT_RT5651_JD_NOT_INV),

	},

	{

		/* KIANO SlimNote 14.2 */

		.callback = byt_rt5651_quirk_cb,