ASoC: tas2781: Fix wrong loading calibrated data sequence

Calibrated data will be set to default after loading DSP config params,
which will cause speaker protection work abnormally. Reload calibrated
data after loading DSP config params. Remove declaration of unused API
which load calibrated data in wrong sequence, changed the copyright year
and correct file name in license
header.

Fixes: ef3bcde75d06 ("ASoC: tas2781: Add tas2781 driver")
Signed-off-by: Shenghao Ding <shenghao-ding@ti.com>
Link: https://msgid.link/r/20240518141546.1742-1-shenghao-ding@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/tas2781-dsp.h b/include/sound/tas2781-dsp.h
index ea9af2726a53ffec6fc36273d7ced8fc2d3759db..7fba7ea26a4b07a953f618489316a5c1a5f20f60 100644 (file)
--- a/include/sound/tas2781-dsp.h
+++ b/include/sound/tas2781-dsp.h
@@ -2,7 +2,7 @@
 //
 // ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier
 //
-// Copyright (C) 2022 - 2023 Texas Instruments Incorporated
+// Copyright (C) 2022 - 2024 Texas Instruments Incorporated
 // https://www.ti.com
 //
 // The TAS2781 driver implements a flexible and configurable
@@ -13,8 +13,8 @@
 // Author: Kevin Lu <kevin-lu@ti.com>
 //
 
-#ifndef __TASDEVICE_DSP_H__
-#define __TASDEVICE_DSP_H__
+#ifndef __TAS2781_DSP_H__
+#define __TAS2781_DSP_H__
 
 #define MAIN_ALL_DEVICES                       0x0d
 #define MAIN_DEVICE_A                          0x01
@@ -180,7 +180,6 @@ void tasdevice_calbin_remove(void *context);
 int tasdevice_select_tuningprm_cfg(void *context, int prm,
        int cfg_no, int rca_conf_no);
 int tasdevice_prmg_load(void *context, int prm_no);
-int tasdevice_prmg_calibdata_load(void *context, int prm_no);
 void tasdevice_tuning_switch(void *context, int state);
 int tas2781_load_calibration(void *context, char *file_name,
        unsigned short i);

diff --git a/sound/soc/codecs/tas2781-fmwlib.c b/sound/soc/codecs/tas2781-fmwlib.c
index a6be81adcb8397302656ecdbbf9dca626e1c2e93..265a8ca25cbbe640d6432fe88f5999fc22ac53fb 100644 (file)
--- a/sound/soc/codecs/tas2781-fmwlib.c
+++ b/sound/soc/codecs/tas2781-fmwlib.c
@@ -2151,6 +2151,24 @@ static int tasdevice_load_data(struct tasdevice_priv *tas_priv,
        return ret;
 }
 
+static void tasdev_load_calibrated_data(struct tasdevice_priv *priv, int i)
+{
+       struct tasdevice_calibration *cal;
+       struct tasdevice_fw *cal_fmw;
+
+       cal_fmw = priv->tasdevice[i].cali_data_fmw;
+
+       /* No calibrated data for current devices, playback will go ahead. */
+       if (!cal_fmw)
+               return;
+
+       cal = cal_fmw->calibrations;
+       if (cal)
+               return;
+
+       load_calib_data(priv, &cal->dev_data);
+}
+
 int tasdevice_select_tuningprm_cfg(void *context, int prm_no,
        int cfg_no, int rca_conf_no)
 {
@@ -2210,21 +2228,9 @@ int tasdevice_select_tuningprm_cfg(void *context, int prm_no,
                for (i = 0; i < tas_priv->ndev; i++) {
                        if (tas_priv->tasdevice[i].is_loaderr == true)
                                continue;
-                       else if (tas_priv->tasdevice[i].is_loaderr == false
-                               && tas_priv->tasdevice[i].is_loading == true) {
-                               struct tasdevice_fw *cal_fmw =
-                                       tas_priv->tasdevice[i].cali_data_fmw;
-
-                               if (cal_fmw) {
-                                       struct tasdevice_calibration
-                                               *cal = cal_fmw->calibrations;
-
-                                       if (cal)
-                                               load_calib_data(tas_priv,
-                                                       &(cal->dev_data));
-                               }
+                       if (tas_priv->tasdevice[i].is_loaderr == false &&
+                               tas_priv->tasdevice[i].is_loading == true)
                                tas_priv->tasdevice[i].cur_prog = prm_no;
-                       }
                }
        }
 
@@ -2245,11 +2251,15 @@ int tasdevice_select_tuningprm_cfg(void *context, int prm_no,
                tasdevice_load_data(tas_priv, &(conf->dev_data));
                for (i = 0; i < tas_priv->ndev; i++) {
                        if (tas_priv->tasdevice[i].is_loaderr == true) {
-                               status |= 1 << (i + 4);
+                               status |= BIT(i + 4);
                                continue;
-                       } else if (tas_priv->tasdevice[i].is_loaderr == false
-                               && tas_priv->tasdevice[i].is_loading == true)
+                       }
+
+                       if (tas_priv->tasdevice[i].is_loaderr == false &&
+                               tas_priv->tasdevice[i].is_loading == true) {
+                               tasdev_load_calibrated_data(tas_priv, i);
                                tas_priv->tasdevice[i].cur_conf = cfg_no;
+                       }
                }
        } else
                dev_dbg(tas_priv->dev, "%s: Unneeded loading dsp conf %d\n",
@@ -2308,65 +2318,6 @@ out:
 }
 EXPORT_SYMBOL_NS_GPL(tasdevice_prmg_load, SND_SOC_TAS2781_FMWLIB);
 
-int tasdevice_prmg_calibdata_load(void *context, int prm_no)
-{
-       struct tasdevice_priv *tas_priv = (struct tasdevice_priv *) context;
-       struct tasdevice_fw *tas_fmw = tas_priv->fmw;
-       struct tasdevice_prog *program;
-       int prog_status = 0;
-       int i;
-
-       if (!tas_fmw) {
-               dev_err(tas_priv->dev, "%s: Firmware is NULL\n", __func__);
-               goto out;
-       }
-
-       if (prm_no >= tas_fmw->nr_programs) {
-               dev_err(tas_priv->dev,
-                       "%s: prm(%d) is not in range of Programs %u\n",
-                       __func__, prm_no, tas_fmw->nr_programs);
-               goto out;
-       }
-
-       for (i = 0, prog_status = 0; i < tas_priv->ndev; i++) {
-               if (prm_no >= 0 && tas_priv->tasdevice[i].cur_prog != prm_no) {
-                       tas_priv->tasdevice[i].cur_conf = -1;
-                       tas_priv->tasdevice[i].is_loading = true;
-                       prog_status++;
-               }
-               tas_priv->tasdevice[i].is_loaderr = false;
-       }
-
-       if (prog_status) {
-               program = &(tas_fmw->programs[prm_no]);
-               tasdevice_load_data(tas_priv, &(program->dev_data));
-               for (i = 0; i < tas_priv->ndev; i++) {
-                       if (tas_priv->tasdevice[i].is_loaderr == true)
-                               continue;
-                       else if (tas_priv->tasdevice[i].is_loaderr == false
-                               && tas_priv->tasdevice[i].is_loading == true) {
-                               struct tasdevice_fw *cal_fmw =
-                                       tas_priv->tasdevice[i].cali_data_fmw;
-
-                               if (cal_fmw) {
-                                       struct tasdevice_calibration *cal =
-                                               cal_fmw->calibrations;
-
-                                       if (cal)
-                                               load_calib_data(tas_priv,
-                                                       &(cal->dev_data));
-                               }
-                               tas_priv->tasdevice[i].cur_prog = prm_no;
-                       }
-               }
-       }
-
-out:
-       return prog_status;
-}
-EXPORT_SYMBOL_NS_GPL(tasdevice_prmg_calibdata_load,
-       SND_SOC_TAS2781_FMWLIB);
-
 void tasdevice_tuning_switch(void *context, int state)
 {
        struct tasdevice_priv *tas_priv = (struct tasdevice_priv *) context;

diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c
index b5abff230e43701f0f00c7b19f895469305747d7..9350972dfefe7e92df320602cd7f96762a946247 100644 (file)
--- a/sound/soc/codecs/tas2781-i2c.c
+++ b/sound/soc/codecs/tas2781-i2c.c
@@ -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
@@ -414,7 +414,7 @@ static void tasdevice_fw_ready(const struct firmware *fmw,
                                __func__, tas_priv->cal_binaryname[i]);
        }
 
-       tasdevice_prmg_calibdata_load(tas_priv, 0);
+       tasdevice_prmg_load(tas_priv, 0);
        tas_priv->cur_prog = 0;
 out:
        if (tas_priv->fw_state == TASDEVICE_DSP_FW_FAIL) {