All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ASoC: cht_bsw_rt5672: Use HID translation unit
@ 2016-11-25 14:40 Takashi Iwai
  2016-11-30 13:47 ` Takashi Iwai
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Takashi Iwai @ 2016-11-25 14:40 UTC (permalink / raw)
  To: Mark Brown; +Cc: Vinod Koul, alsa-devel, Liam Girdwood, Pierre-Louis Bossart

Instead of hard-coded "i2c-10EC5670:00", use the translation helper to
avoid the mismatch between i2c-codec and ACPI strings just like what
we've done for bytcr_rt5640.  This gives more robust binding on funky
devices like Dell Wyse 3040.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/soc/intel/boards/cht_bsw_rt5672.c | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
index df9d254baa18..fe607d8701a0 100644
--- a/sound/soc/intel/boards/cht_bsw_rt5672.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
@@ -25,12 +25,14 @@
 #include <sound/jack.h>
 #include "../../codecs/rt5670.h"
 #include "../atom/sst-atom-controls.h"
+#include "../common/sst-acpi.h"
 
 /* The platform clock #3 outputs 19.2Mhz clock to codec as I2S MCLK */
 #define CHT_PLAT_CLK_3_HZ	19200000
 #define CHT_CODEC_DAI	"rt5670-aif1"
 
 static struct snd_soc_jack cht_bsw_headset;
+static char cht_bsw_codec_name[16];
 
 /* Headset jack detection DAPM pins */
 static struct snd_soc_jack_pin cht_bsw_headset_pins[] = {
@@ -295,7 +297,7 @@ static int cht_suspend_pre(struct snd_soc_card *card)
 	struct snd_soc_codec *codec;
 
 	list_for_each_entry(codec, &card->codec_dev_list, card_list) {
-		if (!strcmp(codec->component.name, "i2c-10EC5670:00")) {
+		if (!strcmp(codec->component.name, cht_bsw_codec_name)) {
 			dev_dbg(codec->dev, "disabling jack detect before going to suspend.\n");
 			rt5670_jack_suspend(codec);
 			break;
@@ -309,7 +311,7 @@ static int cht_resume_post(struct snd_soc_card *card)
 	struct snd_soc_codec *codec;
 
 	list_for_each_entry(codec, &card->codec_dev_list, card_list) {
-		if (!strcmp(codec->component.name, "i2c-10EC5670:00")) {
+		if (!strcmp(codec->component.name, cht_bsw_codec_name)) {
 			dev_dbg(codec->dev, "enabling jack detect for resume.\n");
 			rt5670_jack_resume(codec);
 			break;
@@ -335,9 +337,33 @@ static struct snd_soc_card snd_soc_card_cht = {
 	.resume_post = cht_resume_post,
 };
 
+#define RT5672_I2C_DEFAULT	"i2c-10EC5670:00"
+
 static int snd_cht_mc_probe(struct platform_device *pdev)
 {
 	int ret_val = 0;
+	struct sst_acpi_mach *mach = pdev->dev.platform_data;
+	const char *i2c_name;
+	int i;
+
+	strcpy(cht_bsw_codec_name, RT5672_I2C_DEFAULT);
+
+	/* fixup codec name based on HID */
+	if (mach) {
+		i2c_name = sst_acpi_find_name_from_hid(mach->id);
+		if (i2c_name) {
+			snprintf(cht_bsw_codec_name, sizeof(cht_bsw_codec_name),
+				 "i2c-%s", i2c_name);
+			for (i = 0; i < ARRAY_SIZE(cht_dailink); i++) {
+				if (!strcmp(cht_dailink[i].codec_name,
+					    RT5672_I2C_DEFAULT)) {
+					cht_dailink[i].codec_name =
+						cht_bsw_codec_name;
+					break;
+				}
+			}
+		}
+	}
 
 	/* register the soc card */
 	snd_soc_card_cht.dev = &pdev->dev;
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] ASoC: cht_bsw_rt5672: Use HID translation unit
  2016-11-25 14:40 [PATCH] ASoC: cht_bsw_rt5672: Use HID translation unit Takashi Iwai
@ 2016-11-30 13:47 ` Takashi Iwai
  2016-11-30 14:56   ` Pierre-Louis Bossart
  2016-11-30 16:31 ` Vinod Koul
  2016-11-30 18:07 ` Applied "ASoC: cht_bsw_rt5672: Use HID translation unit" to the asoc tree Mark Brown
  2 siblings, 1 reply; 5+ messages in thread
From: Takashi Iwai @ 2016-11-30 13:47 UTC (permalink / raw)
  To: Mark Brown; +Cc: Vinod Koul, alsa-devel, Liam Girdwood, Pierre-Louis Bossart

On Fri, 25 Nov 2016 15:40:18 +0100,
Takashi Iwai wrote:
> 
> Instead of hard-coded "i2c-10EC5670:00", use the translation helper to
> avoid the mismatch between i2c-codec and ACPI strings just like what
> we've done for bytcr_rt5640.  This gives more robust binding on funky
> devices like Dell Wyse 3040.
> 
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

Vinod, Pierre, Liam, could you guys review?


thanks,

Takashi

> ---
>  sound/soc/intel/boards/cht_bsw_rt5672.c | 30 ++++++++++++++++++++++++++++--
>  1 file changed, 28 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
> index df9d254baa18..fe607d8701a0 100644
> --- a/sound/soc/intel/boards/cht_bsw_rt5672.c
> +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
> @@ -25,12 +25,14 @@
>  #include <sound/jack.h>
>  #include "../../codecs/rt5670.h"
>  #include "../atom/sst-atom-controls.h"
> +#include "../common/sst-acpi.h"
>  
>  /* The platform clock #3 outputs 19.2Mhz clock to codec as I2S MCLK */
>  #define CHT_PLAT_CLK_3_HZ	19200000
>  #define CHT_CODEC_DAI	"rt5670-aif1"
>  
>  static struct snd_soc_jack cht_bsw_headset;
> +static char cht_bsw_codec_name[16];
>  
>  /* Headset jack detection DAPM pins */
>  static struct snd_soc_jack_pin cht_bsw_headset_pins[] = {
> @@ -295,7 +297,7 @@ static int cht_suspend_pre(struct snd_soc_card *card)
>  	struct snd_soc_codec *codec;
>  
>  	list_for_each_entry(codec, &card->codec_dev_list, card_list) {
> -		if (!strcmp(codec->component.name, "i2c-10EC5670:00")) {
> +		if (!strcmp(codec->component.name, cht_bsw_codec_name)) {
>  			dev_dbg(codec->dev, "disabling jack detect before going to suspend.\n");
>  			rt5670_jack_suspend(codec);
>  			break;
> @@ -309,7 +311,7 @@ static int cht_resume_post(struct snd_soc_card *card)
>  	struct snd_soc_codec *codec;
>  
>  	list_for_each_entry(codec, &card->codec_dev_list, card_list) {
> -		if (!strcmp(codec->component.name, "i2c-10EC5670:00")) {
> +		if (!strcmp(codec->component.name, cht_bsw_codec_name)) {
>  			dev_dbg(codec->dev, "enabling jack detect for resume.\n");
>  			rt5670_jack_resume(codec);
>  			break;
> @@ -335,9 +337,33 @@ static struct snd_soc_card snd_soc_card_cht = {
>  	.resume_post = cht_resume_post,
>  };
>  
> +#define RT5672_I2C_DEFAULT	"i2c-10EC5670:00"
> +
>  static int snd_cht_mc_probe(struct platform_device *pdev)
>  {
>  	int ret_val = 0;
> +	struct sst_acpi_mach *mach = pdev->dev.platform_data;
> +	const char *i2c_name;
> +	int i;
> +
> +	strcpy(cht_bsw_codec_name, RT5672_I2C_DEFAULT);
> +
> +	/* fixup codec name based on HID */
> +	if (mach) {
> +		i2c_name = sst_acpi_find_name_from_hid(mach->id);
> +		if (i2c_name) {
> +			snprintf(cht_bsw_codec_name, sizeof(cht_bsw_codec_name),
> +				 "i2c-%s", i2c_name);
> +			for (i = 0; i < ARRAY_SIZE(cht_dailink); i++) {
> +				if (!strcmp(cht_dailink[i].codec_name,
> +					    RT5672_I2C_DEFAULT)) {
> +					cht_dailink[i].codec_name =
> +						cht_bsw_codec_name;
> +					break;
> +				}
> +			}
> +		}
> +	}
>  
>  	/* register the soc card */
>  	snd_soc_card_cht.dev = &pdev->dev;
> -- 
> 2.10.2
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] ASoC: cht_bsw_rt5672: Use HID translation unit
  2016-11-30 13:47 ` Takashi Iwai
@ 2016-11-30 14:56   ` Pierre-Louis Bossart
  0 siblings, 0 replies; 5+ messages in thread
From: Pierre-Louis Bossart @ 2016-11-30 14:56 UTC (permalink / raw)
  To: Takashi Iwai, Mark Brown; +Cc: Vinod Koul, alsa-devel, Liam Girdwood

On 11/30/16 7:47 AM, Takashi Iwai wrote:
> On Fri, 25 Nov 2016 15:40:18 +0100,
> Takashi Iwai wrote:
>>
>> Instead of hard-coded "i2c-10EC5670:00", use the translation helper to
>> avoid the mismatch between i2c-codec and ACPI strings just like what
>> we've done for bytcr_rt5640.  This gives more robust binding on funky
>> devices like Dell Wyse 3040.
>>
>> Signed-off-by: Takashi Iwai <tiwai@suse.de>
>
> Vinod, Pierre, Liam, could you guys review?

Sounds ok

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

On a side note there may be additional changes for rt5645 and rt5672 
drivers since those codecs are apparently used for Baytrail as well, and 
we need to clock patches to set the MCLK to 19.2MHz explicitly.

>
>
> thanks,
>
> Takashi
>
>> ---
>>  sound/soc/intel/boards/cht_bsw_rt5672.c | 30 ++++++++++++++++++++++++++++--
>>  1 file changed, 28 insertions(+), 2 deletions(-)
>>
>> diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
>> index df9d254baa18..fe607d8701a0 100644
>> --- a/sound/soc/intel/boards/cht_bsw_rt5672.c
>> +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
>> @@ -25,12 +25,14 @@
>>  #include <sound/jack.h>
>>  #include "../../codecs/rt5670.h"
>>  #include "../atom/sst-atom-controls.h"
>> +#include "../common/sst-acpi.h"
>>
>>  /* The platform clock #3 outputs 19.2Mhz clock to codec as I2S MCLK */
>>  #define CHT_PLAT_CLK_3_HZ	19200000
>>  #define CHT_CODEC_DAI	"rt5670-aif1"
>>
>>  static struct snd_soc_jack cht_bsw_headset;
>> +static char cht_bsw_codec_name[16];
>>
>>  /* Headset jack detection DAPM pins */
>>  static struct snd_soc_jack_pin cht_bsw_headset_pins[] = {
>> @@ -295,7 +297,7 @@ static int cht_suspend_pre(struct snd_soc_card *card)
>>  	struct snd_soc_codec *codec;
>>
>>  	list_for_each_entry(codec, &card->codec_dev_list, card_list) {
>> -		if (!strcmp(codec->component.name, "i2c-10EC5670:00")) {
>> +		if (!strcmp(codec->component.name, cht_bsw_codec_name)) {
>>  			dev_dbg(codec->dev, "disabling jack detect before going to suspend.\n");
>>  			rt5670_jack_suspend(codec);
>>  			break;
>> @@ -309,7 +311,7 @@ static int cht_resume_post(struct snd_soc_card *card)
>>  	struct snd_soc_codec *codec;
>>
>>  	list_for_each_entry(codec, &card->codec_dev_list, card_list) {
>> -		if (!strcmp(codec->component.name, "i2c-10EC5670:00")) {
>> +		if (!strcmp(codec->component.name, cht_bsw_codec_name)) {
>>  			dev_dbg(codec->dev, "enabling jack detect for resume.\n");
>>  			rt5670_jack_resume(codec);
>>  			break;
>> @@ -335,9 +337,33 @@ static struct snd_soc_card snd_soc_card_cht = {
>>  	.resume_post = cht_resume_post,
>>  };
>>
>> +#define RT5672_I2C_DEFAULT	"i2c-10EC5670:00"
>> +
>>  static int snd_cht_mc_probe(struct platform_device *pdev)
>>  {
>>  	int ret_val = 0;
>> +	struct sst_acpi_mach *mach = pdev->dev.platform_data;
>> +	const char *i2c_name;
>> +	int i;
>> +
>> +	strcpy(cht_bsw_codec_name, RT5672_I2C_DEFAULT);
>> +
>> +	/* fixup codec name based on HID */
>> +	if (mach) {
>> +		i2c_name = sst_acpi_find_name_from_hid(mach->id);
>> +		if (i2c_name) {
>> +			snprintf(cht_bsw_codec_name, sizeof(cht_bsw_codec_name),
>> +				 "i2c-%s", i2c_name);
>> +			for (i = 0; i < ARRAY_SIZE(cht_dailink); i++) {
>> +				if (!strcmp(cht_dailink[i].codec_name,
>> +					    RT5672_I2C_DEFAULT)) {
>> +					cht_dailink[i].codec_name =
>> +						cht_bsw_codec_name;
>> +					break;
>> +				}
>> +			}
>> +		}
>> +	}
>>
>>  	/* register the soc card */
>>  	snd_soc_card_cht.dev = &pdev->dev;
>> --
>> 2.10.2
>>
>> _______________________________________________
>> Alsa-devel mailing list
>> Alsa-devel@alsa-project.org
>> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>>

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] ASoC: cht_bsw_rt5672: Use HID translation unit
  2016-11-25 14:40 [PATCH] ASoC: cht_bsw_rt5672: Use HID translation unit Takashi Iwai
  2016-11-30 13:47 ` Takashi Iwai
@ 2016-11-30 16:31 ` Vinod Koul
  2016-11-30 18:07 ` Applied "ASoC: cht_bsw_rt5672: Use HID translation unit" to the asoc tree Mark Brown
  2 siblings, 0 replies; 5+ messages in thread
From: Vinod Koul @ 2016-11-30 16:31 UTC (permalink / raw)
  To: Takashi Iwai; +Cc: alsa-devel, Mark Brown, Liam Girdwood, Pierre-Louis Bossart

On Fri, Nov 25, 2016 at 03:40:18PM +0100, Takashi Iwai wrote:
> Instead of hard-coded "i2c-10EC5670:00", use the translation helper to
> avoid the mismatch between i2c-codec and ACPI strings just like what
> we've done for bytcr_rt5640.  This gives more robust binding on funky
> devices like Dell Wyse 3040.

Looks good to me.

Acked-by: Vinod Koul <vinod.koul@intel.com>

-- 
~Vinod

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Applied "ASoC: cht_bsw_rt5672: Use HID translation unit" to the asoc tree
  2016-11-25 14:40 [PATCH] ASoC: cht_bsw_rt5672: Use HID translation unit Takashi Iwai
  2016-11-30 13:47 ` Takashi Iwai
  2016-11-30 16:31 ` Vinod Koul
@ 2016-11-30 18:07 ` Mark Brown
  2 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2016-11-30 18:07 UTC (permalink / raw)
  To: Takashi Iwai
  Cc: Vinod Koul, alsa-devel, Mark Brown, Liam Girdwood, Pierre-Louis Bossart

The patch

   ASoC: cht_bsw_rt5672: Use HID translation unit

has been applied to the asoc tree at

   git://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 fee3244cd1f5af813a24537950e211eee4f33297 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 25 Nov 2016 15:40:18 +0100
Subject: [PATCH] ASoC: cht_bsw_rt5672: Use HID translation unit

Instead of hard-coded "i2c-10EC5670:00", use the translation helper to
avoid the mismatch between i2c-codec and ACPI strings just like what
we've done for bytcr_rt5640.  This gives more robust binding on funky
devices like Dell Wyse 3040.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/boards/cht_bsw_rt5672.c | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
index df9d254baa18..fe607d8701a0 100644
--- a/sound/soc/intel/boards/cht_bsw_rt5672.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
@@ -25,12 +25,14 @@
 #include <sound/jack.h>
 #include "../../codecs/rt5670.h"
 #include "../atom/sst-atom-controls.h"
+#include "../common/sst-acpi.h"
 
 /* The platform clock #3 outputs 19.2Mhz clock to codec as I2S MCLK */
 #define CHT_PLAT_CLK_3_HZ	19200000
 #define CHT_CODEC_DAI	"rt5670-aif1"
 
 static struct snd_soc_jack cht_bsw_headset;
+static char cht_bsw_codec_name[16];
 
 /* Headset jack detection DAPM pins */
 static struct snd_soc_jack_pin cht_bsw_headset_pins[] = {
@@ -295,7 +297,7 @@ static int cht_suspend_pre(struct snd_soc_card *card)
 	struct snd_soc_codec *codec;
 
 	list_for_each_entry(codec, &card->codec_dev_list, card_list) {
-		if (!strcmp(codec->component.name, "i2c-10EC5670:00")) {
+		if (!strcmp(codec->component.name, cht_bsw_codec_name)) {
 			dev_dbg(codec->dev, "disabling jack detect before going to suspend.\n");
 			rt5670_jack_suspend(codec);
 			break;
@@ -309,7 +311,7 @@ static int cht_resume_post(struct snd_soc_card *card)
 	struct snd_soc_codec *codec;
 
 	list_for_each_entry(codec, &card->codec_dev_list, card_list) {
-		if (!strcmp(codec->component.name, "i2c-10EC5670:00")) {
+		if (!strcmp(codec->component.name, cht_bsw_codec_name)) {
 			dev_dbg(codec->dev, "enabling jack detect for resume.\n");
 			rt5670_jack_resume(codec);
 			break;
@@ -335,9 +337,33 @@ static struct snd_soc_card snd_soc_card_cht = {
 	.resume_post = cht_resume_post,
 };
 
+#define RT5672_I2C_DEFAULT	"i2c-10EC5670:00"
+
 static int snd_cht_mc_probe(struct platform_device *pdev)
 {
 	int ret_val = 0;
+	struct sst_acpi_mach *mach = pdev->dev.platform_data;
+	const char *i2c_name;
+	int i;
+
+	strcpy(cht_bsw_codec_name, RT5672_I2C_DEFAULT);
+
+	/* fixup codec name based on HID */
+	if (mach) {
+		i2c_name = sst_acpi_find_name_from_hid(mach->id);
+		if (i2c_name) {
+			snprintf(cht_bsw_codec_name, sizeof(cht_bsw_codec_name),
+				 "i2c-%s", i2c_name);
+			for (i = 0; i < ARRAY_SIZE(cht_dailink); i++) {
+				if (!strcmp(cht_dailink[i].codec_name,
+					    RT5672_I2C_DEFAULT)) {
+					cht_dailink[i].codec_name =
+						cht_bsw_codec_name;
+					break;
+				}
+			}
+		}
+	}
 
 	/* register the soc card */
 	snd_soc_card_cht.dev = &pdev->dev;
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-11-30 18:07 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-25 14:40 [PATCH] ASoC: cht_bsw_rt5672: Use HID translation unit Takashi Iwai
2016-11-30 13:47 ` Takashi Iwai
2016-11-30 14:56   ` Pierre-Louis Bossart
2016-11-30 16:31 ` Vinod Koul
2016-11-30 18:07 ` Applied "ASoC: cht_bsw_rt5672: Use HID translation unit" to the asoc tree Mark Brown

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.