ASoC: Intel: bytcr_rt5640: Update quirk for Acer Switch 10 SW5-012 2-in-1
diff mbox series

Message ID 20191119145138.59162-1-hdegoede@redhat.com
State Accepted
Commit 0bb887709eb16bdc4b5baddd8337abf3de72917f
Headers show
Series
  • ASoC: Intel: bytcr_rt5640: Update quirk for Acer Switch 10 SW5-012 2-in-1
Related show

Commit Message

Hans de Goede Nov. 19, 2019, 2:51 p.m. UTC
When the Acer Switch 10 SW5-012 quirk was added we did not have
jack-detection support yet; and the builtin microphone selection of
the original quirk is wrong too.

Fix the microphone-input quirk and add jack-detection info so that the
internal-microphone and headphone/set jack on the Switch 10 work properly.

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

Comments

Andy Shevchenko Nov. 19, 2019, 3:03 p.m. UTC | #1
On Tue, Nov 19, 2019 at 03:51:38PM +0100, Hans de Goede wrote:
> When the Acer Switch 10 SW5-012 quirk was added we did not have
> jack-detection support yet; and the builtin microphone selection of
> the original quirk is wrong too.
> 
> Fix the microphone-input quirk and add jack-detection info so that the
> internal-microphone and headphone/set jack on the Switch 10 work properly.

FWIW,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  sound/soc/intel/boards/bytcr_rt5640.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
> index 9c1aa4ec9cba..dd2b5ad08659 100644
> --- a/sound/soc/intel/boards/bytcr_rt5640.c
> +++ b/sound/soc/intel/boards/bytcr_rt5640.c
> @@ -405,10 +405,12 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
>  			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
>  			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"),
>  		},
> -		.driver_data = (void *)(BYT_RT5640_IN1_MAP |
> -						 BYT_RT5640_MCLK_EN |
> -						 BYT_RT5640_SSP0_AIF1),
> -
> +		.driver_data = (void *)(BYT_RT5640_DMIC1_MAP |
> +					BYT_RT5640_JD_SRC_JD2_IN4N |
> +					BYT_RT5640_OVCD_TH_2000UA |
> +					BYT_RT5640_OVCD_SF_0P75 |
> +					BYT_RT5640_SSP0_AIF1 |
> +					BYT_RT5640_MCLK_EN),
>  	},
>  	{
>  		.matches = {
> -- 
> 2.23.0
>
Pierre-Louis Bossart Nov. 19, 2019, 3:18 p.m. UTC | #2
On 11/19/19 8:51 AM, Hans de Goede wrote:
> When the Acer Switch 10 SW5-012 quirk was added we did not have
> jack-detection support yet; and the builtin microphone selection of
> the original quirk is wrong too.
> 
> Fix the microphone-input quirk and add jack-detection info so that the
> internal-microphone and headphone/set jack on the Switch 10 work properly.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Thanks Hans,

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


> ---
>   sound/soc/intel/boards/bytcr_rt5640.c | 10 ++++++----
>   1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
> index 9c1aa4ec9cba..dd2b5ad08659 100644
> --- a/sound/soc/intel/boards/bytcr_rt5640.c
> +++ b/sound/soc/intel/boards/bytcr_rt5640.c
> @@ -405,10 +405,12 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
>   			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
>   			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"),
>   		},
> -		.driver_data = (void *)(BYT_RT5640_IN1_MAP |
> -						 BYT_RT5640_MCLK_EN |
> -						 BYT_RT5640_SSP0_AIF1),
> -
> +		.driver_data = (void *)(BYT_RT5640_DMIC1_MAP |
> +					BYT_RT5640_JD_SRC_JD2_IN4N |
> +					BYT_RT5640_OVCD_TH_2000UA |
> +					BYT_RT5640_OVCD_SF_0P75 |
> +					BYT_RT5640_SSP0_AIF1 |
> +					BYT_RT5640_MCLK_EN),
>   	},
>   	{
>   		.matches = {
>

Patch
diff mbox series

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index 9c1aa4ec9cba..dd2b5ad08659 100644
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -405,10 +405,12 @@  static const struct dmi_system_id byt_rt5640_quirk_table[] = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"),
 		},
-		.driver_data = (void *)(BYT_RT5640_IN1_MAP |
-						 BYT_RT5640_MCLK_EN |
-						 BYT_RT5640_SSP0_AIF1),
-
+		.driver_data = (void *)(BYT_RT5640_DMIC1_MAP |
+					BYT_RT5640_JD_SRC_JD2_IN4N |
+					BYT_RT5640_OVCD_TH_2000UA |
+					BYT_RT5640_OVCD_SF_0P75 |
+					BYT_RT5640_SSP0_AIF1 |
+					BYT_RT5640_MCLK_EN),
 	},
 	{
 		.matches = {