1. Patchew
  2. linux
  3. View series

[PATCH v1] ALSA: hda/tas2781: Add speaker id check for ASUS projects

Baojun Xu posted 1 patch 1 month, 2 weeks ago
There is a newer version of this series
include/sound/tas2781.h         |  3 +++
sound/pci/hda/tas2781_hda_i2c.c | 39 ++++++++++++++++++++++++++++++---
2 files changed, 39 insertions(+), 3 deletions(-)
[PATCH v1] ALSA: hda/tas2781: Add speaker id check for ASUS projects
Posted by Baojun Xu 1 month, 2 weeks ago 
Add speaker id check by gpio in ACPI for ASUS projects.

Signed-off-by: Baojun Xu <baojun.xu@ti.com>
---
 include/sound/tas2781.h         |  3 +++
 sound/pci/hda/tas2781_hda_i2c.c | 39 ++++++++++++++++++++++++++++++---
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/include/sound/tas2781.h b/include/sound/tas2781.h
index 8cd6da0480b7..f8a3dc13cbbc 100644
--- a/include/sound/tas2781.h
+++ b/include/sound/tas2781.h
@@ -107,6 +107,8 @@
 #define TASDEVICE_CMD_DELAY		0x3
 #define TASDEVICE_CMD_FIELD_W		0x4
 
+#define TAS2781_ASUS_ID			0x10430000
+
 enum audio_device {
 	TAS2563,
 	TAS2781,
@@ -156,6 +158,7 @@ struct tasdevice_priv {
 	struct tasdevice_rca rcabin;
 	struct calidata cali_data;
 	struct tasdevice_fw *fmw;
+	struct gpio_desc *speaker_id;
 	struct gpio_desc *reset;
 	struct mutex codec_lock;
 	struct regmap *regmap;
diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c
index 370d847517f9..1f71927825b2 100644
--- a/sound/pci/hda/tas2781_hda_i2c.c
+++ b/sound/pci/hda/tas2781_hda_i2c.c
@@ -615,7 +615,7 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context)
 	struct tasdevice_priv *tas_priv = context;
 	struct tas2781_hda *tas_hda = dev_get_drvdata(tas_priv->dev);
 	struct hda_codec *codec = tas_priv->codec;
-	int i, ret;
+	int i, ret, spk_id;
 
 	pm_runtime_get_sync(tas_priv->dev);
 	mutex_lock(&tas_priv->codec_lock);
@@ -648,8 +648,23 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context)
 	tasdevice_dsp_remove(tas_priv);
 
 	tas_priv->fw_state = TASDEVICE_DSP_FW_PENDING;
-	scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%04X.bin",
-		codec->core.subsystem_id & 0xffff);
+	if ((codec->core.subsystem_id & 0xffff0000) == TAS2781_ASUS_ID) {
+		// Speaker id need to be checked.
+		if (tas_priv->speaker_id)
+			spk_id = gpiod_get_value(tas_priv->speaker_id);
+		else
+			spk_id = 0;
+		if (spk_id < 0 || spk_id > 1) {
+			// Speaker id is not valid, use default.
+			dev_dbg(tas_priv->dev, "Wrong spk_id = %d\n", spk_id);
+			spk_id = 0;
+		}
+		scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%04X%01d.bin",
+			codec->core.subsystem_id & 0xffff, spk_id);
+	} else {
+		scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%04X.bin",
+			codec->core.subsystem_id & 0xffff);
+	}
 	ret = tasdevice_dsp_parser(tas_priv);
 	if (ret) {
 		dev_err(tas_priv->dev, "dspfw load %s error\n",
@@ -787,6 +802,15 @@ static void tas2781_hda_remove(struct device *dev)
 	tasdevice_remove(tas_hda->priv);
 }
 
+static const struct acpi_gpio_params speakerid_gpios = { 0, 0, false };
+static const struct acpi_gpio_params interrupt_gpios = { 1, 0, false };
+
+static const struct acpi_gpio_mapping tas2781_speaker_id_gpios[] = {
+	{ "speakerid-gpios", &speakerid_gpios, 1 },
+	{ "interrupt-gpios", &interrupt_gpios, 1 },
+	{ }
+};
+
 static int tas2781_hda_i2c_probe(struct i2c_client *clt)
 {
 	struct tas2781_hda *tas_hda;
@@ -823,6 +847,15 @@ static int tas2781_hda_i2c_probe(struct i2c_client *clt)
 	if (ret)
 		return dev_err_probe(tas_hda->dev, ret,
 			"Platform not supported\n");
+	ret = devm_acpi_dev_add_driver_gpios(tas_hda->dev,
+					     tas2781_speaker_id_gpios);
+	if (ret)
+		dev_info(tas_hda->dev, "Unable to add GPIO mapping table\n");
+
+	tas_hda->priv->speaker_id = devm_gpiod_get(tas_hda->dev, "speakerid",
+						   GPIOD_IN);
+	if (IS_ERR(tas_hda->priv->speaker_id))
+		dev_info(tas_hda->dev, "Failed to get Speaker id gpio.\n");
 
 	ret = tasdevice_init(tas_hda->priv);
 	if (ret)
-- 
2.43.0
Re: [PATCH v1] ALSA: hda/tas2781: Add speaker id check for ASUS projects
Posted by Andy Shevchenko 1 month, 2 weeks ago 
On Fri, Oct 11, 2024 at 04:53:03PM +0800, Baojun Xu wrote:
> Add speaker id check by gpio in ACPI for ASUS projects.

...

> +		scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%04X%01d.bin",

sizeof() ?

> +			codec->core.subsystem_id & 0xffff, spk_id);

lower_16_bits() ?

...

> +		scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%04X.bin",

Ditto.

> +			codec->core.subsystem_id & 0xffff);

Ditto.

...

> +	tas_hda->priv->speaker_id = devm_gpiod_get(tas_hda->dev, "speakerid",
> +						   GPIOD_IN);
> +	if (IS_ERR(tas_hda->priv->speaker_id))
> +		dev_info(tas_hda->dev, "Failed to get Speaker id gpio.\n");

This is wrong. If it's okay to ignore, make it optional. Either way you have to
return an error code to the caller as you effectively ignore deferred probe,
for example.

-- 
With Best Regards,
Andy Shevchenko
Re: [PATCH v1] ALSA: hda/tas2781: Add speaker id check for ASUS projects
Posted by Takashi Iwai 1 month, 2 weeks ago 
On Fri, 11 Oct 2024 10:53:03 +0200,
Baojun Xu wrote:
> 
> Add speaker id check by gpio in ACPI for ASUS projects.

Please give more background info.  e.g. why is the speaker id check
needed, what does this patch actually fix, and why it's specific to
ASUS?


thanks,

Takashi

> 
> Signed-off-by: Baojun Xu <baojun.xu@ti.com>
> ---
>  include/sound/tas2781.h         |  3 +++
>  sound/pci/hda/tas2781_hda_i2c.c | 39 ++++++++++++++++++++++++++++++---
>  2 files changed, 39 insertions(+), 3 deletions(-)
> 
> diff --git a/include/sound/tas2781.h b/include/sound/tas2781.h
> index 8cd6da0480b7..f8a3dc13cbbc 100644
> --- a/include/sound/tas2781.h
> +++ b/include/sound/tas2781.h
> @@ -107,6 +107,8 @@
>  #define TASDEVICE_CMD_DELAY		0x3
>  #define TASDEVICE_CMD_FIELD_W		0x4
>  
> +#define TAS2781_ASUS_ID			0x10430000
> +
>  enum audio_device {
>  	TAS2563,
>  	TAS2781,
> @@ -156,6 +158,7 @@ struct tasdevice_priv {
>  	struct tasdevice_rca rcabin;
>  	struct calidata cali_data;
>  	struct tasdevice_fw *fmw;
> +	struct gpio_desc *speaker_id;
>  	struct gpio_desc *reset;
>  	struct mutex codec_lock;
>  	struct regmap *regmap;
> diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c
> index 370d847517f9..1f71927825b2 100644
> --- a/sound/pci/hda/tas2781_hda_i2c.c
> +++ b/sound/pci/hda/tas2781_hda_i2c.c
> @@ -615,7 +615,7 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context)
>  	struct tasdevice_priv *tas_priv = context;
>  	struct tas2781_hda *tas_hda = dev_get_drvdata(tas_priv->dev);
>  	struct hda_codec *codec = tas_priv->codec;
> -	int i, ret;
> +	int i, ret, spk_id;
>  
>  	pm_runtime_get_sync(tas_priv->dev);
>  	mutex_lock(&tas_priv->codec_lock);
> @@ -648,8 +648,23 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context)
>  	tasdevice_dsp_remove(tas_priv);
>  
>  	tas_priv->fw_state = TASDEVICE_DSP_FW_PENDING;
> -	scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%04X.bin",
> -		codec->core.subsystem_id & 0xffff);
> +	if ((codec->core.subsystem_id & 0xffff0000) == TAS2781_ASUS_ID) {
> +		// Speaker id need to be checked.
> +		if (tas_priv->speaker_id)
> +			spk_id = gpiod_get_value(tas_priv->speaker_id);
> +		else
> +			spk_id = 0;
> +		if (spk_id < 0 || spk_id > 1) {
> +			// Speaker id is not valid, use default.
> +			dev_dbg(tas_priv->dev, "Wrong spk_id = %d\n", spk_id);
> +			spk_id = 0;
> +		}
> +		scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%04X%01d.bin",
> +			codec->core.subsystem_id & 0xffff, spk_id);
> +	} else {
> +		scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%04X.bin",
> +			codec->core.subsystem_id & 0xffff);
> +	}
>  	ret = tasdevice_dsp_parser(tas_priv);
>  	if (ret) {
>  		dev_err(tas_priv->dev, "dspfw load %s error\n",
> @@ -787,6 +802,15 @@ static void tas2781_hda_remove(struct device *dev)
>  	tasdevice_remove(tas_hda->priv);
>  }
>  
> +static const struct acpi_gpio_params speakerid_gpios = { 0, 0, false };
> +static const struct acpi_gpio_params interrupt_gpios = { 1, 0, false };
> +
> +static const struct acpi_gpio_mapping tas2781_speaker_id_gpios[] = {
> +	{ "speakerid-gpios", &speakerid_gpios, 1 },
> +	{ "interrupt-gpios", &interrupt_gpios, 1 },
> +	{ }
> +};
> +
>  static int tas2781_hda_i2c_probe(struct i2c_client *clt)
>  {
>  	struct tas2781_hda *tas_hda;
> @@ -823,6 +847,15 @@ static int tas2781_hda_i2c_probe(struct i2c_client *clt)
>  	if (ret)
>  		return dev_err_probe(tas_hda->dev, ret,
>  			"Platform not supported\n");
> +	ret = devm_acpi_dev_add_driver_gpios(tas_hda->dev,
> +					     tas2781_speaker_id_gpios);
> +	if (ret)
> +		dev_info(tas_hda->dev, "Unable to add GPIO mapping table\n");
> +
> +	tas_hda->priv->speaker_id = devm_gpiod_get(tas_hda->dev, "speakerid",
> +						   GPIOD_IN);
> +	if (IS_ERR(tas_hda->priv->speaker_id))
> +		dev_info(tas_hda->dev, "Failed to get Speaker id gpio.\n");
>  
>  	ret = tasdevice_init(tas_hda->priv);
>  	if (ret)
> -- 
> 2.43.0
>
Re: [PATCH v1] ALSA: hda/tas2781: Add speaker id check for ASUS projects
Posted by Takashi Iwai 1 month, 2 weeks ago 
On Fri, 11 Oct 2024 11:09:08 +0200,
Takashi Iwai wrote:
> 
> On Fri, 11 Oct 2024 10:53:03 +0200,
> Baojun Xu wrote:
> > 
> > Add speaker id check by gpio in ACPI for ASUS projects.
> 
> Please give more background info.  e.g. why is the speaker id check
> needed, what does this patch actually fix, and why it's specific to
> ASUS?

Also, for the future submissions, please send to
linux-sound@vger.kernel.org instead of alsa-devel ML.


thanks,

Takashi

> 
> 
> thanks,
> 
> Takashi
> 
> > 
> > Signed-off-by: Baojun Xu <baojun.xu@ti.com>
> > ---
> >  include/sound/tas2781.h         |  3 +++
> >  sound/pci/hda/tas2781_hda_i2c.c | 39 ++++++++++++++++++++++++++++++---
> >  2 files changed, 39 insertions(+), 3 deletions(-)
> > 
> > diff --git a/include/sound/tas2781.h b/include/sound/tas2781.h
> > index 8cd6da0480b7..f8a3dc13cbbc 100644
> > --- a/include/sound/tas2781.h
> > +++ b/include/sound/tas2781.h
> > @@ -107,6 +107,8 @@
> >  #define TASDEVICE_CMD_DELAY		0x3
> >  #define TASDEVICE_CMD_FIELD_W		0x4
> >  
> > +#define TAS2781_ASUS_ID			0x10430000
> > +
> >  enum audio_device {
> >  	TAS2563,
> >  	TAS2781,
> > @@ -156,6 +158,7 @@ struct tasdevice_priv {
> >  	struct tasdevice_rca rcabin;
> >  	struct calidata cali_data;
> >  	struct tasdevice_fw *fmw;
> > +	struct gpio_desc *speaker_id;
> >  	struct gpio_desc *reset;
> >  	struct mutex codec_lock;
> >  	struct regmap *regmap;
> > diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c
> > index 370d847517f9..1f71927825b2 100644
> > --- a/sound/pci/hda/tas2781_hda_i2c.c
> > +++ b/sound/pci/hda/tas2781_hda_i2c.c
> > @@ -615,7 +615,7 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context)
> >  	struct tasdevice_priv *tas_priv = context;
> >  	struct tas2781_hda *tas_hda = dev_get_drvdata(tas_priv->dev);
> >  	struct hda_codec *codec = tas_priv->codec;
> > -	int i, ret;
> > +	int i, ret, spk_id;
> >  
> >  	pm_runtime_get_sync(tas_priv->dev);
> >  	mutex_lock(&tas_priv->codec_lock);
> > @@ -648,8 +648,23 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context)
> >  	tasdevice_dsp_remove(tas_priv);
> >  
> >  	tas_priv->fw_state = TASDEVICE_DSP_FW_PENDING;
> > -	scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%04X.bin",
> > -		codec->core.subsystem_id & 0xffff);
> > +	if ((codec->core.subsystem_id & 0xffff0000) == TAS2781_ASUS_ID) {
> > +		// Speaker id need to be checked.
> > +		if (tas_priv->speaker_id)
> > +			spk_id = gpiod_get_value(tas_priv->speaker_id);
> > +		else
> > +			spk_id = 0;
> > +		if (spk_id < 0 || spk_id > 1) {
> > +			// Speaker id is not valid, use default.
> > +			dev_dbg(tas_priv->dev, "Wrong spk_id = %d\n", spk_id);
> > +			spk_id = 0;
> > +		}
> > +		scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%04X%01d.bin",
> > +			codec->core.subsystem_id & 0xffff, spk_id);
> > +	} else {
> > +		scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%04X.bin",
> > +			codec->core.subsystem_id & 0xffff);
> > +	}
> >  	ret = tasdevice_dsp_parser(tas_priv);
> >  	if (ret) {
> >  		dev_err(tas_priv->dev, "dspfw load %s error\n",
> > @@ -787,6 +802,15 @@ static void tas2781_hda_remove(struct device *dev)
> >  	tasdevice_remove(tas_hda->priv);
> >  }
> >  
> > +static const struct acpi_gpio_params speakerid_gpios = { 0, 0, false };
> > +static const struct acpi_gpio_params interrupt_gpios = { 1, 0, false };
> > +
> > +static const struct acpi_gpio_mapping tas2781_speaker_id_gpios[] = {
> > +	{ "speakerid-gpios", &speakerid_gpios, 1 },
> > +	{ "interrupt-gpios", &interrupt_gpios, 1 },
> > +	{ }
> > +};
> > +
> >  static int tas2781_hda_i2c_probe(struct i2c_client *clt)
> >  {
> >  	struct tas2781_hda *tas_hda;
> > @@ -823,6 +847,15 @@ static int tas2781_hda_i2c_probe(struct i2c_client *clt)
> >  	if (ret)
> >  		return dev_err_probe(tas_hda->dev, ret,
> >  			"Platform not supported\n");
> > +	ret = devm_acpi_dev_add_driver_gpios(tas_hda->dev,
> > +					     tas2781_speaker_id_gpios);
> > +	if (ret)
> > +		dev_info(tas_hda->dev, "Unable to add GPIO mapping table\n");
> > +
> > +	tas_hda->priv->speaker_id = devm_gpiod_get(tas_hda->dev, "speakerid",
> > +						   GPIOD_IN);
> > +	if (IS_ERR(tas_hda->priv->speaker_id))
> > +		dev_info(tas_hda->dev, "Failed to get Speaker id gpio.\n");
> >  
> >  	ret = tasdevice_init(tas_hda->priv);
> >  	if (ret)
> > -- 
> > 2.43.0
> >

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.