update for disable clock error detection

5 files changed, 67 insertions, 94 deletions

diff --git a/tas2555-codec.c b/tas2555-codec.c
index 92dcbc5..a6d36e2 100755
--- a/tas2555-codec.c
+++ b/tas2555-codec.c
@@ -68,10 +68,7 @@ static unsigned int tas2555_codec_read(struct snd_soc_codec *pCodec,
         int ret = 0;
         unsigned int Value = 0;
 
-        mutex_lock(&pTAS2555->codec_lock);
         ret = pTAS2555->read(pTAS2555, nRegister, &Value);
-        mutex_unlock(&pTAS2555->codec_lock);
-        
         if (ret < 0) {
                 dev_err(pTAS2555->dev, "%s, %d, ERROR happen=%d\n", __FUNCTION__,
                         __LINE__, ret);
@@ -85,10 +82,9 @@ static int tas2555_codec_write(struct snd_soc_codec *pCodec, unsigned int nRegis
 {
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(pCodec);
         int ret = 0;
-        mutex_lock(&pTAS2555->codec_lock);
+
         ret = pTAS2555->write(pTAS2555, nRegister, nValue);
-        mutex_unlock(&pTAS2555->codec_lock);
-        
+
         return ret;
 }
 
@@ -140,12 +136,10 @@ static int tas2555_mute(struct snd_soc_dai *dai, int mute)
 {
         struct snd_soc_codec *codec = dai->codec;
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(codec);
-        
+
         dev_dbg(pTAS2555->dev, "%s\n", __func__);
-        mutex_lock(&pTAS2555->codec_lock);
         tas2555_enable(pTAS2555, !mute);
-        mutex_unlock(&pTAS2555->codec_lock);
-        
+
         return 0;
 }
 
@@ -167,10 +161,8 @@ static int tas2555_hw_params(struct snd_pcm_substream *pSubstream,
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(pCodec);
 
         dev_dbg(pCodec->dev, "%s\n", __func__);
-        
-        mutex_lock(&pTAS2555->codec_lock);
+
         tas2555_set_sampling_rate(pTAS2555, params_rate(pParams));
-        mutex_unlock(&pTAS2555->codec_lock);
 
         return 0;
 }
@@ -179,9 +171,9 @@ static int tas2555_set_dai_fmt(struct snd_soc_dai *pDAI, unsigned int nFormat)
 {
         struct snd_soc_codec *codec = pDAI->codec;
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(codec);
-        
+
         dev_dbg(pTAS2555->dev, "%s\n", __func__);
-        
+
         return 0;
 }
 
@@ -190,9 +182,9 @@ static int tas2555_prepare(struct snd_pcm_substream *pSubstream,
 {
         struct snd_soc_codec *codec = pDAI->codec;
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(codec);
-        
+
         dev_dbg(pTAS2555->dev, "%s\n", __func__);
-        
+
         return 0;
 }
 
@@ -200,7 +192,7 @@ static int tas2555_set_bias_level(struct snd_soc_codec *pCodec,
         enum snd_soc_bias_level eLevel)
 {
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(pCodec);
-        
+
         dev_dbg(pTAS2555->dev, "%s: %d\n", __func__, eLevel);
 
         return 0;
@@ -272,8 +264,6 @@ static int tas2555_get_reg_value(struct snd_kcontrol *pKcontrol,
         unsigned int reg;
         unsigned int nValue;
 
-        mutex_lock(&pTAS2555->codec_lock);      
-        
         if (TAS2555_REG_IS_VALID(register_addr.book,
                         register_addr.page, register_addr.reg)) {
                 reg = TAS2555_REG((unsigned int) register_addr.book,
@@ -289,8 +279,7 @@ static int tas2555_get_reg_value(struct snd_kcontrol *pKcontrol,
         dev_dbg(pTAS2555->dev, "%s: Read [%d, %d, %d] = %ld\n", __func__,
                 register_addr.book, register_addr.page, register_addr.reg,
                 pUcontrol->value.integer.value[0]);
-                
-        mutex_unlock(&pTAS2555->codec_lock);
+
         return 0;
 }
 
@@ -305,8 +294,6 @@ static int tas2555_put_reg_value(struct snd_kcontrol *pKcontrol,
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(codec);
         unsigned int reg;
 
-        mutex_lock(&pTAS2555->codec_lock);
-        
         if (TAS2555_REG_IS_VALID(register_addr.book,
                         register_addr.page, register_addr.reg)) {
                 reg = TAS2555_REG((unsigned int) register_addr.book,
@@ -321,7 +308,6 @@ static int tas2555_put_reg_value(struct snd_kcontrol *pKcontrol,
                 register_addr.book, register_addr.page, register_addr.reg,
                 pUcontrol->value.integer.value[0]);
 
-        mutex_unlock(&pTAS2555->codec_lock);                    
         return 0;
 }
 
@@ -335,13 +321,10 @@ static int tas2555_power_ctrl_get(struct snd_kcontrol *pKcontrol,
 #endif
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(codec);
 
-        mutex_lock(&pTAS2555->codec_lock);      
-        
         pValue->value.integer.value[0] = pTAS2555->mnPowerCtrl;
         dev_dbg(pTAS2555->dev, "tas2555_power_ctrl_get = %d\n",
                 pTAS2555->mnPowerCtrl);
-                
-        mutex_unlock(&pTAS2555->codec_lock);                    
+
         return 0;
 }
 
@@ -355,7 +338,6 @@ static int tas2555_power_ctrl_put(struct snd_kcontrol *pKcontrol,
 #endif
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(codec);
 
-        mutex_lock(&pTAS2555->codec_lock);      
         pTAS2555->mnPowerCtrl = pValue->value.integer.value[0];
 
         dev_dbg(pTAS2555->dev, "tas2555_power_ctrl_put = %d\n",
@@ -365,8 +347,7 @@ static int tas2555_power_ctrl_put(struct snd_kcontrol *pKcontrol,
                 tas2555_enable(pTAS2555, true);
         if (pTAS2555->mnPowerCtrl == 0)
                 tas2555_enable(pTAS2555, false);
-                
-        mutex_unlock(&pTAS2555->codec_lock);
+
         return 0;
 }
 
@@ -379,18 +360,13 @@ static int tas2555_fs_get(struct snd_kcontrol *pKcontrol,
         struct snd_soc_codec *codec = snd_kcontrol_chip(pKcontrol);
 #endif
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(codec);
-
         int nFS = 48000;
 
-        mutex_lock(&pTAS2555->codec_lock);
-        
         if (pTAS2555->mpFirmware->mnConfigurations)
                 nFS = pTAS2555->mpFirmware->mpConfigurations[pTAS2555->mnCurrentConfiguration].mnSamplingRate;
-        
+
         pValue->value.integer.value[0] = nFS;
-        
-        mutex_unlock(&pTAS2555->codec_lock);
-        
+
         dev_dbg(pTAS2555->dev, "tas2555_fs_get = %d\n", nFS);
         return 0;
 }
@@ -406,13 +382,11 @@ static int tas2555_fs_put(struct snd_kcontrol *pKcontrol,
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(codec);
         int ret = 0;
         int nFS = pValue->value.integer.value[0];
-        
+
         dev_info(pTAS2555->dev, "tas2555_fs_put = %d\n", nFS);
-        
-        mutex_lock(&pTAS2555->codec_lock);      
+
         ret = tas2555_set_sampling_rate(pTAS2555, nFS);
-        
-        mutex_unlock(&pTAS2555->codec_lock);
+
         return ret;
 }
 
@@ -425,10 +399,8 @@ static int tas2555_nRe_get(struct snd_kcontrol *pKcontrol,
         struct snd_soc_codec *codec = snd_kcontrol_chip(pKcontrol);
 #endif
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(codec);
-        unsigned int nRe;
-        int ret;
-
-        mutex_lock(&pTAS2555->codec_lock);
+        unsigned int nRe = 0;
+        int ret = 0;
 
         if ((pTAS2555->mpFirmware->mnConfigurations > 0) && pTAS2555->mbPowerUp) {
                 ret = tas2555_get_Re(pTAS2555, &nRe);
@@ -438,8 +410,6 @@ static int tas2555_nRe_get(struct snd_kcontrol *pKcontrol,
                         pValue->value.integer.value[0] = 0;
         }
 
-        mutex_unlock(&pTAS2555->codec_lock);
-
         dev_dbg(pTAS2555->dev, "tas2555_nRe_get = %d\n", nRe);
         return 0;
 }
@@ -456,14 +426,10 @@ static int tas2555_errcode_get(struct snd_kcontrol *pKcontrol,
         unsigned int errCode = 0;
         int nResult;
 
-        mutex_lock(&pTAS2555->codec_lock);
-
         nResult = tas2555_get_errcode(pTAS2555, &errCode);
         if (nResult >= 0)
                 pValue->value.integer.value[0] = errCode;
 
-        mutex_unlock(&pTAS2555->codec_lock);
-
         dev_dbg(pTAS2555->dev, "tas2555_errcode_get = 0x%x\n", errCode);
         return 0;
 }
@@ -477,11 +443,10 @@ static int tas2555_program_get(struct snd_kcontrol *pKcontrol,
         struct snd_soc_codec *codec = snd_kcontrol_chip(pKcontrol);
 #endif
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(codec);
-        mutex_lock(&pTAS2555->codec_lock);      
+
         pValue->value.integer.value[0] = pTAS2555->mnCurrentProgram;
         dev_dbg(pTAS2555->dev, "tas2555_program_get = %d\n",
                 pTAS2555->mnCurrentProgram);
-        mutex_unlock(&pTAS2555->codec_lock);
         return 0;
 }
 
@@ -496,9 +461,8 @@ static int tas2555_program_put(struct snd_kcontrol *pKcontrol,
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(codec);
         unsigned int nProgram = pValue->value.integer.value[0];
         int ret = 0;
-        mutex_lock(&pTAS2555->codec_lock);
+
         ret = tas2555_set_program(pTAS2555, nProgram, -1);
-        mutex_unlock(&pTAS2555->codec_lock);
         return ret;
 }
 
@@ -512,11 +476,9 @@ static int tas2555_configuration_get(struct snd_kcontrol *pKcontrol,
 #endif
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(codec);
 
-        mutex_lock(&pTAS2555->codec_lock);
         pValue->value.integer.value[0] = pTAS2555->mnCurrentConfiguration;
         dev_dbg(pTAS2555->dev, "tas2555_configuration_get = %d\n",
                 pTAS2555->mnCurrentConfiguration);
-        mutex_unlock(&pTAS2555->codec_lock);
         return 0;
 }
 
@@ -532,9 +494,7 @@ static int tas2555_configuration_put(struct snd_kcontrol *pKcontrol,
         unsigned int nConfiguration = pValue->value.integer.value[0];
         int ret = 0;
 
-        mutex_lock(&pTAS2555->codec_lock);
         ret = tas2555_set_config(pTAS2555, nConfiguration);
-        mutex_unlock(&pTAS2555->codec_lock);
         return ret;
 }
 
@@ -548,12 +508,10 @@ static int tas2555_calibration_get(struct snd_kcontrol *pKcontrol,
 #endif
         struct tas2555_priv *pTAS2555 = snd_soc_codec_get_drvdata(codec);
 
-        mutex_lock(&pTAS2555->codec_lock);
         pValue->value.integer.value[0] = pTAS2555->mnCurrentCalibration;
         dev_info(pTAS2555->dev,
                 "tas2555_calibration_get = %d\n",
                 pTAS2555->mnCurrentCalibration);
-        mutex_unlock(&pTAS2555->codec_lock);
         return 0;
 }
 
@@ -569,9 +527,7 @@ static int tas2555_calibration_put(struct snd_kcontrol *pKcontrol,
         unsigned int nCalibration = pValue->value.integer.value[0];
         int ret = 0;
 
-        mutex_lock(&pTAS2555->codec_lock);
         ret = tas2555_set_calibration(pTAS2555, nCalibration);
-        mutex_unlock(&pTAS2555->codec_lock);
 
         return ret;
 }
@@ -717,14 +673,14 @@ int tas2555_register_codec(struct tas2555_priv *pTAS2555)
         nResult = snd_soc_register_codec(pTAS2555->dev, 
                 &soc_codec_driver_tas2555,
                 tas2555_dai_driver, ARRAY_SIZE(tas2555_dai_driver));
-                
+
         return nResult;
 }
 
 int tas2555_deregister_codec(struct tas2555_priv *pTAS2555)
 {
         snd_soc_unregister_codec(pTAS2555->dev);
-                
+
         return 0;
 }
 
diff --git a/tas2555-core.c b/tas2555-core.c
index 541e01e..9bb1e35 100755
--- a/tas2555-core.c
+++ b/tas2555-core.c
@@ -108,6 +108,8 @@ static unsigned int p_tas2555_default_data[] = {
 
 static unsigned int p_tas2555_irq_config[] = {
         /* TAS2555_GPIO4_PIN_REG, 0x07, set GPIO4 as int1, default */
+//      TAS2555_CLK_ERR_CTRL2, 0x11,    //enable clock error detection on PLL
+//      TAS2555_CLK_ERR_CTRL3, 0x11,    //enable clock error detection on PLL
         TAS2555_INT_GEN1_REG, 0x11,     /* enable spk OC and OV */
         TAS2555_INT_GEN2_REG, 0x11,     /* enable clk err1 and die OT */
         TAS2555_INT_GEN3_REG, 0x11,     /* enable clk err2 and brownout */
@@ -118,7 +120,7 @@ static unsigned int p_tas2555_irq_config[] = {
 
 #define TAS2555_STARTUP_DATA_PLL_CLKIN_INDEX 3
 static unsigned int p_tas2555_startup_data[] = {
-        TAS2555_CLK_ERR_CTRL, 0x0b,     //enable clock error detection on PLL
+        TAS2555_CLK_ERR_CTRL1, 0x00,    //disable clock error detection on PLL
         TAS2555_PLL_CLKIN_REG, TAS2555_DEFAULT_PLL_CLKIN,
         TAS2555_POWER_CTRL2_REG, 0xA0,  //Class-D, Boost power up
         TAS2555_POWER_CTRL2_REG, 0xA3,  //Class-D, Boost, IV sense power up
@@ -134,6 +136,7 @@ static unsigned int p_tas2555_unmute_data[] = {
 };
 
 static unsigned int p_tas2555_shutdown_data[] = {
+        TAS2555_CLK_ERR_CTRL1, 0x00,    //disable clock error detection
         TAS2555_SOFT_MUTE_REG, 0x01,    //soft mute
         TAS2555_UDELAY, 10000,          //delay 10ms
         TAS2555_MUTE_REG, 0x03,         //mute
@@ -153,6 +156,7 @@ static unsigned int p_tas2555_shutdown_clk_err[] = {
 #endif
 
 static unsigned int p_tas2555_mute_DSP_down_data[] = {
+        TAS2555_CLK_ERR_CTRL1, 0x00,    //disable clock error detection
         TAS2555_MUTE_REG, 0x03,         //mute
         TAS2555_PLL_CLKIN_REG, 0x0F,    //PLL clock input = osc
         TAS2555_POWER_CTRL1_REG, 0x60,  //DSP power down
@@ -239,14 +243,16 @@ static void failsafe(struct tas2555_priv *pTAS2555)
 {
         dev_err(pTAS2555->dev, "%s\n", __func__);
         pTAS2555->mnErrorCode |= TAS2555_ERROR_FAILSAFE;
-        tas2555_enable(pTAS2555, false);
+        dev_dbg(pTAS2555->dev, "Enable: load shutdown sequence\n");
+        tas2555_dev_load_data(pTAS2555, p_tas2555_shutdown_data);
+        //tas2555_dev_load_data(pTAS2555, p_tas2555_shutdown_clk_err);
+        if (pTAS2555->mpFirmware != NULL)
+                tas2555_clear_firmware(pTAS2555->mpFirmware);
+        pTAS2555->mbPowerUp = false;
         pTAS2555->hw_reset(pTAS2555);
         pTAS2555->write(pTAS2555, TAS2555_SW_RESET_REG, 0x01);
         udelay(1000);
         pTAS2555->write(pTAS2555, TAS2555_SPK_CTRL_REG, 0x04);
-        if(pTAS2555->mpFirmware != NULL){
-                tas2555_clear_firmware(pTAS2555->mpFirmware);
-        }
 }
 
 #define Q_FACTOR 0x08000000
@@ -257,10 +263,15 @@ static bool chkReBoundary(struct tas2555_priv *pTAS2555,
         bool nResult = false;
         unsigned int ReHigh_calc, ReLow_calc, Re_calc = 0;
         static unsigned int counter = 3;
-        
+
         if (ReOrginal < Q_FACTOR)
                 goto end;
 
+        if (ReDelta == 0) {
+                dev_err(pTAS2555->dev, "need to set ReDelta!");
+                goto end;
+        }
+
         switch (scale) {
         case 0:
         /* 8Ohm speaker */
@@ -302,7 +313,8 @@ static bool chkReBoundary(struct tas2555_priv *pTAS2555,
                         counter = 3;
 
                 if (counter == 0) {
-                        counter = 3;
+                        dev_err(pTAS2555->dev, "will failsafe, OrigRe=%d, Delta_Re=%d, Re=%d, scale=%d\n",
+                                ReOrginal, ReDelta, Re, scale);
                         nResult = true;
                 }
         }
@@ -373,7 +385,7 @@ int tas2555_get_errcode(struct tas2555_priv *pTAS2555, unsigned int *pErrCode)
 
                 if (nValue & 0x04) {
                         errcode |= TAS2555_ERROR_CLKPRESENT;
-                        nResult = pTAS2555->write(pTAS2555, TAS2555_CLK_ERR_CTRL, 0x00);
+                        nResult = pTAS2555->write(pTAS2555, TAS2555_CLK_ERR_CTRL1, 0x00);
                 }
                 if (nValue & 0x08)
                         errcode |= TAS2555_ERROR_BROWNOUT;
@@ -423,8 +435,15 @@ int tas2555_load_default(struct tas2555_priv *pTAS2555)
 int tas2555_enable(struct tas2555_priv *pTAS2555, bool bEnable)
 {
         int nResult = 0;
-        
+
         dev_dbg(pTAS2555->dev, "Enable: %d\n", bEnable);
+
+        if ((pTAS2555->mpFirmware->mnPrograms == 0)
+                ||(pTAS2555->mpFirmware->mnConfigurations == 0)) {
+                        pTAS2555->mnErrorCode |= TAS2555_ERROR_FWNOTLOAD;
+                        goto end;
+                }
+
         if (bEnable) {
                 if (!pTAS2555->mbPowerUp) {
                         TConfiguration *pConfiguration;
@@ -1775,8 +1794,10 @@ int tas2555_set_calibration(struct tas2555_priv *pTAS2555,
         if(pTAS2555->mbPowerUp){
                 nResult = tas2555_load_block(pTAS2555, 
                         &(pTAS2555->mpCalFirmware->mpCalibrations[pTAS2555->mnCurrentCalibration].mBlock));
-                if (nResult >= 0)
+                if (nResult >= 0) {
                         pTAS2555->mbLoadCalibrationPostPowerUp = false; 
+                        nResult = tas2555_get_ReCoefficient(pTAS2555, &pTAS2555->mnReOrignal);
+                }
         }else{
                 pTAS2555->mbLoadCalibrationPostPowerUp = true; 
         }
diff --git a/tas2555-core.h b/tas2555-core.h
index d8779bd..bbf5559 100755
--- a/tas2555-core.h
+++ b/tas2555-core.h
@@ -28,19 +28,19 @@
 
 #include "tas2555.h"
 
-#define TAS2555_YRAM_BOOK                               140
-#define TAS2555_YRAM1_PAGE                              42
-#define TAS2555_YRAM1_START_REG                 88
-#define TAS2555_YRAM1_END_REG                   127
+#define TAS2555_YRAM_BOOK                               140     /* BOOK: 0x8c */
+#define TAS2555_YRAM1_PAGE                              42      /* Page: 0x2a */
+#define TAS2555_YRAM1_START_REG                 88      /* Reg: 0x58 */
+#define TAS2555_YRAM1_END_REG                   127     /* Reg: 0x7f */
 
-#define TAS2555_YRAM2_START_PAGE                43
-#define TAS2555_YRAM2_END_PAGE                  52
+#define TAS2555_YRAM2_START_PAGE                43      /* Page: 0x2b */
+#define TAS2555_YRAM2_END_PAGE                  52      /* Page: 0x34 */
 #define TAS2555_YRAM2_START_REG                 8
 #define TAS2555_YRAM2_END_REG                   127
 
-#define TAS2555_YRAM3_PAGE                              53
+#define TAS2555_YRAM3_PAGE                              53      /* Page: 0x35 */
 #define TAS2555_YRAM3_START_REG                 8
-#define TAS2555_YRAM3_END_REG                   55
+#define TAS2555_YRAM3_END_REG                   55      /* Reg: 0x37 */
 
 typedef struct {
         unsigned char mnOffset;
diff --git a/tas2555-regmap.c b/tas2555-regmap.c
index 6a857b2..47a6cc7 100755
--- a/tas2555-regmap.c
+++ b/tas2555-regmap.c
@@ -335,7 +335,7 @@ static void irq_work_routine(struct work_struct *work)
                 dev_err(pTAS2555->dev, "critical error INT Status: 0x%x\n", nDevInt1Status);
                 if (nDevInt1Status & 0x04) {
                         pTAS2555->mnErrorCode |= TAS2555_ERROR_CLKPRESENT;
-                        nResult = pTAS2555->write(pTAS2555, TAS2555_CLK_ERR_CTRL, 0x00);
+                        nResult = pTAS2555->write(pTAS2555, TAS2555_CLK_ERR_CTRL1, 0x00);
                 }
                 if (nDevInt1Status & 0x08)
                         pTAS2555->mnErrorCode |= TAS2555_ERROR_BROWNOUT;
@@ -483,7 +483,6 @@ static int tas2555_i2c_probe(struct i2c_client *pClient,
         pTAS2555->mbTILoadActive = false;
 
 #ifdef CONFIG_TAS2555_CODEC     
-        mutex_init(&pTAS2555->codec_lock);
         tas2555_register_codec(pTAS2555);
 #endif
 
@@ -512,7 +511,6 @@ static int tas2555_i2c_remove(struct i2c_client *pClient)
 
 #ifdef CONFIG_TAS2555_CODEC             
         tas2555_deregister_codec(pTAS2555);
-        mutex_destroy(&pTAS2555->codec_lock);
 #endif
 
 #ifdef CONFIG_TAS2555_MISC              
diff --git a/tas2555.h b/tas2555.h
index 7c1a920..904cd07 100755
--- a/tas2555.h
+++ b/tas2555.h
@@ -68,7 +68,9 @@
 #define TAS2555_CRC_RESET_REG                   TAS2555_REG(0, 0, 33)
 #define TAS2555_DSP_MODE_SELECT_REG             TAS2555_REG(0, 0, 34)
 #define TAS2555_NONAME42_REG                    TAS2555_REG(0, 0, 42)
-#define TAS2555_CLK_ERR_CTRL                    TAS2555_REG(0, 0, 44)
+#define TAS2555_CLK_ERR_CTRL1                   TAS2555_REG(0, 0, 44)
+#define TAS2555_CLK_ERR_CTRL2                   TAS2555_REG(0, 0, 45)
+#define TAS2555_CLK_ERR_CTRL3                   TAS2555_REG(0, 0, 46)
 #define TAS2555_POWER_UP_FLAG_REG               TAS2555_REG(0, 0, 100)
 #define TAS2555_FLAGS_1                         TAS2555_REG(0, 0, 104)  /* B0_P0_R0x68*/
 #define TAS2555_FLAGS_2                         TAS2555_REG(0, 0, 108)  /* B0_P0_R0x6c*/
@@ -418,10 +420,6 @@ struct tas2555_priv {
         int (*set_config)(struct tas2555_priv *pTAS2555, int config);
         int (*set_calibration)(struct tas2555_priv *pTAS2555, int calibration);
 
-#ifdef CONFIG_TAS2555_CODEC
-        struct mutex codec_lock;
-#endif
-
 #ifdef CONFIG_TAS2555_MISC
         int mnDBGCmd;
         int mnCurrentReg;