[PATCH 1/2] ASoC: Intel: bytcr_rt5640: Add quirk for Toshiba Encore WT10-A tablet

[PATCH 1/2] ASoC: Intel: bytcr_rt5640: Add quirk for Toshiba Encore WT10-A tablet

[Hans de Goede]

The Toshiba Encore WT10-A tablet almost fully works with the default
settings for Bay Trail CR devices. The only issue is that it uses a
digital mic. connected the the DMIC1 input instead of an analog mic.

Add a quirk for this model using the default settings with the input-map
replaced with BYT_RT5640_DMIC1_MAP.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 sound/soc/intel/boards/bytcr_rt5640.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index fbfd53874b47..5c1a5e2aff6f 100644
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -754,6 +754,18 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
 					BYT_RT5640_JD_NOT_INV |
 					BYT_RT5640_MCLK_EN),
 	},
+	{	/* Toshiba Encore WT10-A */
+		.matches = {
+			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "TOSHIBA WT10-A-103"),
+		},
+		.driver_data = (void *)(BYT_RT5640_DMIC1_MAP |
+					BYT_RT5640_JD_SRC_JD1_IN4P |
+					BYT_RT5640_OVCD_TH_2000UA |
+					BYT_RT5640_OVCD_SF_0P75 |
+					BYT_RT5640_SSP0_AIF2 |
+					BYT_RT5640_MCLK_EN),
+	},
 	{	/* Catch-all for generic Insyde tablets, must be last */
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
-- 
2.26.2

[PATCH 2/2] ASoC: rt5645: Add platform-data for Asus T101HA

[Hans de Goede]

The Asus T101HA uses the default jack-detect mode 3, but instead of
using an analog microphone it is using a DMIC on dmic-data-pin 1,
like the Asus T100HA. Note unlike the T100HA its jack-detect is not
inverted.

Add a DMI quirk with the correct settings for this model.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 sound/soc/codecs/rt5645.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index 6ba1849a77b0..e2e1d5b03b38 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -3625,6 +3625,12 @@ static const struct rt5645_platform_data asus_t100ha_platform_data = {
 	.inv_jd1_1 = true,
 };
 
+static const struct rt5645_platform_data asus_t101ha_platform_data = {
+	.dmic1_data_pin = RT5645_DMIC_DATA_IN2N,
+	.dmic2_data_pin = RT5645_DMIC2_DISABLE,
+	.jd_mode = 3,
+};
+
 static const struct rt5645_platform_data lenovo_ideapad_miix_310_pdata = {
 	.jd_mode = 3,
 	.in2_diff = true,
@@ -3708,6 +3714,14 @@ static const struct dmi_system_id dmi_platform_data[] = {
 		},
 		.driver_data = (void *)&asus_t100ha_platform_data,
 	},
+	{
+		.ident = "ASUS T101HA",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "T101HA"),
+		},
+		.driver_data = (void *)&asus_t101ha_platform_data,
+	},
 	{
 		.ident = "MINIX Z83-4",
 		.matches = {
-- 
2.26.2

Re: [PATCH 1/2] ASoC: Intel: bytcr_rt5640: Add quirk for Toshiba Encore WT10-A tablet

[Pierre-Louis Bossart]

On 6/8/20 3:46 PM, Hans de Goede wrote:
> The Toshiba Encore WT10-A tablet almost fully works with the default
> settings for Bay Trail CR devices. The only issue is that it uses a
> digital mic. connected the the DMIC1 input instead of an analog mic.
> 
> Add a quirk for this model using the default settings with the input-map
> replaced with BYT_RT5640_DMIC1_MAP.

For patch 1 and 2

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>   sound/soc/intel/boards/bytcr_rt5640.c | 12 ++++++++++++
>   1 file changed, 12 insertions(+)
> 
> diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
> index fbfd53874b47..5c1a5e2aff6f 100644
> --- a/sound/soc/intel/boards/bytcr_rt5640.c
> +++ b/sound/soc/intel/boards/bytcr_rt5640.c
> @@ -754,6 +754,18 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
>   					BYT_RT5640_JD_NOT_INV |
>   					BYT_RT5640_MCLK_EN),
>   	},
> +	{	/* Toshiba Encore WT10-A */
> +		.matches = {
> +			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
> +			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "TOSHIBA WT10-A-103"),
> +		},
> +		.driver_data = (void *)(BYT_RT5640_DMIC1_MAP |
> +					BYT_RT5640_JD_SRC_JD1_IN4P |
> +					BYT_RT5640_OVCD_TH_2000UA |
> +					BYT_RT5640_OVCD_SF_0P75 |
> +					BYT_RT5640_SSP0_AIF2 |
> +					BYT_RT5640_MCLK_EN),
> +	},
>   	{	/* Catch-all for generic Insyde tablets, must be last */
>   		.matches = {
>   			DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
> 

Re: [PATCH 2/2] ASoC: rt5645: Add platform-data for Asus T101HA

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

On Mon, Jun 08, 2020 at 10:46:34PM +0200, Hans de Goede wrote:
> The Asus T101HA uses the default jack-detect mode 3, but instead of
> using an analog microphone it is using a DMIC on dmic-data-pin 1,
> like the Asus T100HA. Note unlike the T100HA its jack-detect is not
> inverted.

Hans, it'd help if you could send cover letters for multi-patch serieses
- it makes it easier to pick up tags that people send for the whole
series.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH 2/2] ASoC: rt5645: Add platform-data for Asus T101HA

[Hans de Goede]

Hi,

On 6/9/20 3:38 PM, Mark Brown wrote:
> On Mon, Jun 08, 2020 at 10:46:34PM +0200, Hans de Goede wrote:
>> The Asus T101HA uses the default jack-detect mode 3, but instead of
>> using an analog microphone it is using a DMIC on dmic-data-pin 1,
>> like the Asus T100HA. Note unlike the T100HA its jack-detect is not
>> inverted.
> 
> Hans, it'd help if you could send cover letters for multi-patch serieses
> - it makes it easier to pick up tags that people send for the whole
> series.

Ok, I will try to remember to add a cover letter for my next
"assorted ASoC X86 quirks" series.

Regards,

Hans

Re: [PATCH 1/2] ASoC: Intel: bytcr_rt5640: Add quirk for Toshiba Encore WT10-A tablet

[Mark Brown]

On Mon, 8 Jun 2020 22:46:33 +0200, Hans de Goede wrote:
> The Toshiba Encore WT10-A tablet almost fully works with the default
> settings for Bay Trail CR devices. The only issue is that it uses a
> digital mic. connected the the DMIC1 input instead of an analog mic.
> 
> Add a quirk for this model using the default settings with the input-map
> replaced with BYT_RT5640_DMIC1_MAP.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/2] ASoC: Intel: bytcr_rt5640: Add quirk for Toshiba Encore WT10-A tablet
      commit: 199a5e8fda54ab3c8c6f6bf980c004e97ebf5ccb
[2/2] ASoC: rt5645: Add platform-data for Asus T101HA
      commit: 79d4f823a06796656289f97b922493da5690e46c

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