[PATCH 1/2] ASoC: Intel: bytcr_rt5640: Add quirk for the Nuvison/TMax TM800W560 tablet

[PATCH 1/2] ASoC: Intel: bytcr_rt5640: Add quirk for the Nuvison/TMax TM800W560 tablet

[Hans de Goede]

Add a quirk for the Nuvison/TMax TM800W560 tablet, this tablet uses IN1
for the internal mic rather then the default IN3 and it uses JD2 rather
then JD1 for its not-inverted jack-detect switch.

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

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index d675d550f6c1..27a05778584f 100644
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -549,6 +549,20 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
 					BYT_RT5640_DIFF_MIC |
 					BYT_RT5640_MCLK_EN),
 	},
+	{	/* Nuvison/TMax TM800W560 */
+		.matches = {
+			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "TMAX"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "TM800W560L"),
+		},
+		.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_JD_NOT_INV |
+					BYT_RT5640_DIFF_MIC |
+					BYT_RT5640_SSP0_AIF1 |
+					BYT_RT5640_MCLK_EN),
+	},
 	{	/* Pipo W4 */
 		.matches = {
 			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
-- 
2.17.1

[PATCH 2/2] ASoC: Intel: bytcr_rt5640: Fix Acer Iconia 8 over-current detect threshold

[Hans de Goede]

Change the over-current detect threshold on the Acer Iconia 8 from
2000ua to 1500uA, this fixes headset button presses not being detected.

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

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index 27a05778584f..e577ace1c1d8 100644
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -404,7 +404,7 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
 		},
 		.driver_data = (void *)(BYT_RT5640_DMIC1_MAP |
 					BYT_RT5640_JD_SRC_JD1_IN4P |
-					BYT_RT5640_OVCD_TH_2000UA |
+					BYT_RT5640_OVCD_TH_1500UA |
 					BYT_RT5640_OVCD_SF_0P75 |
 					BYT_RT5640_SSP0_AIF1 |
 					BYT_RT5640_MCLK_EN),
-- 
2.17.1

Re: [PATCH 1/2] ASoC: Intel: bytcr_rt5640: Add quirk for the Nuvison/TMax TM800W560 tablet

[Pierre-Louis Bossart]

On 6/3/18 8:42 AM, Hans de Goede wrote:
> Add a quirk for the Nuvison/TMax TM800W560 tablet, this tablet uses IN1
> for the internal mic rather then the default IN3 and it uses JD2 rather
> then JD1 for its not-inverted jack-detect switch.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

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

BTW maybe we should move those quirks to a separate file, the quirk 
definitions will become larger than actual code pretty soon ...

> ---
>   sound/soc/intel/boards/bytcr_rt5640.c | 14 ++++++++++++++
>   1 file changed, 14 insertions(+)
> 
> diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
> index d675d550f6c1..27a05778584f 100644
> --- a/sound/soc/intel/boards/bytcr_rt5640.c
> +++ b/sound/soc/intel/boards/bytcr_rt5640.c
> @@ -549,6 +549,20 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
>   					BYT_RT5640_DIFF_MIC |
>   					BYT_RT5640_MCLK_EN),
>   	},
> +	{	/* Nuvison/TMax TM800W560 */
> +		.matches = {
> +			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "TMAX"),
> +			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "TM800W560L"),
> +		},
> +		.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_JD_NOT_INV |
> +					BYT_RT5640_DIFF_MIC |
> +					BYT_RT5640_SSP0_AIF1 |
> +					BYT_RT5640_MCLK_EN),
> +	},
>   	{	/* Pipo W4 */
>   		.matches = {
>   			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
> 

Re: [PATCH 1/2] ASoC: Intel: bytcr_rt5640: Add quirk for the Nuvison/TMax TM800W560 tablet

[Hans de Goede]

Hi,

On 04-06-18 15:57, Pierre-Louis Bossart wrote:
> On 6/3/18 8:42 AM, Hans de Goede wrote:
>> Add a quirk for the Nuvison/TMax TM800W560 tablet, this tablet uses IN1
>> for the internal mic rather then the default IN3 and it uses JD2 rather
>> then JD1 for its not-inverted jack-detect switch.
>>
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> 
> Both
> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Thanks.

> BTW maybe we should move those quirks to a separate file, the quirk definitions will become larger than actual code pretty soon ...

I can do that when the next quirk comes along.

Mark what is your take on this?

Regards,

Hans



> 
>> ---
>>   sound/soc/intel/boards/bytcr_rt5640.c | 14 ++++++++++++++
>>   1 file changed, 14 insertions(+)
>>
>> diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
>> index d675d550f6c1..27a05778584f 100644
>> --- a/sound/soc/intel/boards/bytcr_rt5640.c
>> +++ b/sound/soc/intel/boards/bytcr_rt5640.c
>> @@ -549,6 +549,20 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
>>                       BYT_RT5640_DIFF_MIC |
>>                       BYT_RT5640_MCLK_EN),
>>       },
>> +    {    /* Nuvison/TMax TM800W560 */
>> +        .matches = {
>> +            DMI_EXACT_MATCH(DMI_SYS_VENDOR, "TMAX"),
>> +            DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "TM800W560L"),
>> +        },
>> +        .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_JD_NOT_INV |
>> +                    BYT_RT5640_DIFF_MIC |
>> +                    BYT_RT5640_SSP0_AIF1 |
>> +                    BYT_RT5640_MCLK_EN),
>> +    },
>>       {    /* Pipo W4 */
>>           .matches = {
>>               DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
>>
> 
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 1/2] ASoC: Intel: bytcr_rt5640: Add quirk for the Nuvison/TMax TM800W560 tablet

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 530 bytes --]

On Mon, Jun 04, 2018 at 04:00:06PM +0200, Hans de Goede wrote:
> On 04-06-18 15:57, Pierre-Louis Bossart wrote:

> > BTW maybe we should move those quirks to a separate file, the quirk definitions will become larger than actual code pretty soon ...

> I can do that when the next quirk comes along.

> Mark what is your take on this?

I don't know that I really mind - those machine drivers are basically
all quirk tables at some level, it's just a question of what goes in the
core bit and what goes into patches on top of that.

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

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Applied "ASoC: Intel: bytcr_rt5640: Fix Acer Iconia 8 over-current detect threshold" to the asoc tree

[Mark Brown]

The patch

   ASoC: Intel: bytcr_rt5640: Fix Acer Iconia 8 over-current detect threshold

has been applied to the asoc tree at

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

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

>From f12a0a3c4cc6f594d7c2ea361f2396ae5c518d2c Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 3 Jun 2018 15:42:32 +0200
Subject: [PATCH] ASoC: Intel: bytcr_rt5640: Fix Acer Iconia 8 over-current
 detect threshold

Change the over-current detect threshold on the Acer Iconia 8 from
2000ua to 1500uA, this fixes headset button presses not being detected.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/boards/bytcr_rt5640.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index 8571f41767ef..7456566c5648 100644
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -404,7 +404,7 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
 		},
 		.driver_data = (void *)(BYT_RT5640_DMIC1_MAP |
 					BYT_RT5640_JD_SRC_JD1_IN4P |
-					BYT_RT5640_OVCD_TH_2000UA |
+					BYT_RT5640_OVCD_TH_1500UA |
 					BYT_RT5640_OVCD_SF_0P75 |
 					BYT_RT5640_SSP0_AIF1 |
 					BYT_RT5640_MCLK_EN),
-- 
2.17.1

Applied "ASoC: Intel: bytcr_rt5640: Add quirk for the Nuvison/TMax TM800W560 tablet" to the asoc tree

[Mark Brown]

The patch

   ASoC: Intel: bytcr_rt5640: Add quirk for the Nuvison/TMax TM800W560 tablet

has been applied to the asoc tree at

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

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

>From 6cea3590820819049df5945136b8a5acd72ed0f8 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 3 Jun 2018 15:42:31 +0200
Subject: [PATCH] ASoC: Intel: bytcr_rt5640: Add quirk for the Nuvison/TMax
 TM800W560 tablet

Add a quirk for the Nuvison/TMax TM800W560 tablet, this tablet uses IN1
for the internal mic rather then the default IN3 and it uses JD2 rather
then JD1 for its not-inverted jack-detect switch.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/boards/bytcr_rt5640.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index 5c4f9ea40f57..8571f41767ef 100644
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -565,6 +565,20 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
 					BYT_RT5640_DIFF_MIC |
 					BYT_RT5640_MCLK_EN),
 	},
+	{	/* Nuvison/TMax TM800W560 */
+		.matches = {
+			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "TMAX"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "TM800W560L"),
+		},
+		.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_JD_NOT_INV |
+					BYT_RT5640_DIFF_MIC |
+					BYT_RT5640_SSP0_AIF1 |
+					BYT_RT5640_MCLK_EN),
+	},
 	{	/* Pipo W4 */
 		.matches = {
 			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
-- 
2.17.1