ASoc: TAS2781: rename the tas2781_reset as tasdevice_reset

Rename the tas2781_reset as tasdevice_reset in case of misunderstanding.
RESET register for both tas2563 and tas2781 is same and the use of reset
pin is also same.

Signed-off-by: Shenghao Ding <shenghao-ding@ti.com>
Link: https://patch.msgid.link/20240709043342.946-1-shenghao-ding@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/tas2781.h b/include/sound/tas2781.h
index cd8ce522b78e21a90b85d6808070c78b06283acd..a43ad6dcb7c7e2d554527fa34cf0d88f169f8bef 100644 (file)
--- a/include/sound/tas2781.h
+++ b/include/sound/tas2781.h
@@ -2,7 +2,7 @@
 //
 // ALSA SoC Texas Instruments TAS2563/TAS2781 Audio Smart Amplifier
 //
-// Copyright (C) 2022 - 2023 Texas Instruments Incorporated
+// Copyright (C) 2022 - 2024 Texas Instruments Incorporated
 // https://www.ti.com
 //
 // The TAS2563/TAS2781 driver implements a flexible and configurable
@@ -43,8 +43,8 @@
                                        (page * 128)) + reg)
 
 /*Software Reset */
-#define TAS2781_REG_SWRESET            TASDEVICE_REG(0x0, 0X0, 0x01)
-#define TAS2781_REG_SWRESET_RESET      BIT(0)
+#define TASDEVICE_REG_SWRESET          TASDEVICE_REG(0x0, 0X0, 0x01)
+#define TASDEVICE_REG_SWRESET_RESET    BIT(0)
 
 /*I2C Checksum */
 #define TASDEVICE_I2CChecksum          TASDEVICE_REG(0x0, 0x0, 0x7E)
@@ -140,7 +140,7 @@ struct tasdevice_priv {
        void (*apply_calibration)(struct tasdevice_priv *tas_priv);
 };
 
-void tas2781_reset(struct tasdevice_priv *tas_dev);
+void tasdevice_reset(struct tasdevice_priv *tas_dev);
 int tascodec_init(struct tasdevice_priv *tas_priv, void *codec,
        struct module *module,
        void (*cont)(const struct firmware *fw, void *context));

diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c
index 75f7674c66ee7ae8d9c407798193f4618b82a6b7..10420360b214a9a357126b3e1440595740b487ae 100644 (file)
--- a/sound/pci/hda/tas2781_hda_i2c.c
+++ b/sound/pci/hda/tas2781_hda_i2c.c
@@ -834,7 +834,7 @@ static int tas2781_hda_i2c_probe(struct i2c_client *clt)
        pm_runtime_set_active(tas_hda->dev);
        pm_runtime_enable(tas_hda->dev);
 
-       tas2781_reset(tas_hda->priv);
+       tasdevice_reset(tas_hda->priv);
 
        ret = component_add(tas_hda->dev, &tas2781_hda_comp_ops);
        if (ret) {
@@ -929,7 +929,7 @@ static int tas2781_system_resume(struct device *dev)
                tas_hda->priv->tasdevice[i].cur_prog = -1;
                tas_hda->priv->tasdevice[i].cur_conf = -1;
        }
-       tas2781_reset(tas_hda->priv);
+       tasdevice_reset(tas_hda->priv);
        tasdevice_prmg_load(tas_hda->priv, tas_hda->priv->cur_prog);
 
        /* If calibrated data occurs error, dsp will still work with default

diff --git a/sound/soc/codecs/tas2781-comlib.c b/sound/soc/codecs/tas2781-comlib.c
index 6db1a260da82d65e9d64c4428157613ef4bc61ec..1fbf4560f5cc2639ad89b2b406e349bde9ef2092 100644 (file)
--- a/sound/soc/codecs/tas2781-comlib.c
+++ b/sound/soc/codecs/tas2781-comlib.c
@@ -243,7 +243,7 @@ struct tasdevice_priv *tasdevice_kzalloc(struct i2c_client *i2c)
 }
 EXPORT_SYMBOL_GPL(tasdevice_kzalloc);
 
-void tas2781_reset(struct tasdevice_priv *tas_dev)
+void tasdevice_reset(struct tasdevice_priv *tas_dev)
 {
        int ret, i;
 
@@ -254,8 +254,8 @@ void tas2781_reset(struct tasdevice_priv *tas_dev)
        } else {
                for (i = 0; i < tas_dev->ndev; i++) {
                        ret = tasdevice_dev_write(tas_dev, i,
-                               TAS2781_REG_SWRESET,
-                               TAS2781_REG_SWRESET_RESET);
+                               TASDEVICE_REG_SWRESET,
+                               TASDEVICE_REG_SWRESET_RESET);
                        if (ret < 0)
                                dev_err(tas_dev->dev,
                                        "dev %d swreset fail, %d\n",
@@ -264,7 +264,7 @@ void tas2781_reset(struct tasdevice_priv *tas_dev)
        }
        usleep_range(1000, 1050);
 }
-EXPORT_SYMBOL_GPL(tas2781_reset);
+EXPORT_SYMBOL_GPL(tasdevice_reset);
 
 int tascodec_init(struct tasdevice_priv *tas_priv, void *codec,
        struct module *module,

diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c
index b412f8f2e5d53216d54c0a9831b558a1991a16bb..d5d95ae57c73c90cc8ef7ca344d9690f0fac2d2f 100644 (file)
--- a/sound/soc/codecs/tas2781-i2c.c
+++ b/sound/soc/codecs/tas2781-i2c.c
@@ -742,6 +742,8 @@ static int tasdevice_i2c_probe(struct i2c_client *i2c)
        if (ret)
                goto err;
 
+       tasdevice_reset(tas_priv);
+
        ret = devm_snd_soc_register_component(tas_priv->dev,
                &soc_codec_driver_tasdevice,
                tasdevice_dai_driver, ARRAY_SIZE(tasdevice_dai_driver));