disable the old ALSA command and add 30ms delay for powering down device

2 files changed, 26 insertions, 0 deletions

diff --git a/tas2560-codec.c b/tas2560-codec.c
index 0ddda50..695c8be 100755
--- a/tas2560-codec.c
+++ b/tas2560-codec.c
@@ -50,6 +50,7 @@
 #include "tas2560-core.h"
 
 #define TAS2560_MDELAY 0xFFFFFFFE
+#define KCONTROL_CODEC
 
 #define MAX_CLIENTS 8
 static struct i2c_client *g_client[MAX_CLIENTS];
@@ -268,7 +269,11 @@ static int tas2560_codec_remove(struct snd_soc_codec *codec)
 static int tas2560_get_load(struct snd_kcontrol *pKcontrol,
                         struct snd_ctl_elem_value *pUcontrol)
 {
+#ifdef KCONTROL_CODEC
+        struct snd_soc_codec *pCodec = snd_soc_kcontrol_codec(pKcontrol);
+#else
         struct snd_soc_codec *pCodec = snd_kcontrol_chip(pKcontrol);
+#endif
         struct tas2560_priv *pTAS2560 = snd_soc_codec_get_drvdata(pCodec);
 
         pUcontrol->value.integer.value[0] = pTAS2560->mnLoad;
@@ -279,7 +284,11 @@ static int tas2560_get_load(struct snd_kcontrol *pKcontrol,
 static int tas2560_set_load(struct snd_kcontrol *pKcontrol,
                         struct snd_ctl_elem_value *pUcontrol)
 {
+#ifdef KCONTROL_CODEC
+        struct snd_soc_codec *pCodec = snd_soc_kcontrol_codec(pKcontrol);
+#else
         struct snd_soc_codec *pCodec = snd_kcontrol_chip(pKcontrol);
+#endif  
         struct tas2560_priv *pTAS2560 = snd_soc_codec_get_drvdata(pCodec);
 
         pTAS2560->mnLoad = pUcontrol->value.integer.value[0];
@@ -293,7 +302,11 @@ static int tas2560_set_load(struct snd_kcontrol *pKcontrol,
 static int tas2560_get_Sampling_Rate(struct snd_kcontrol *pKcontrol,
                                 struct snd_ctl_elem_value *pUcontrol)
 {
+#ifdef KCONTROL_CODEC
+        struct snd_soc_codec *pCodec = snd_soc_kcontrol_codec(pKcontrol);
+#else
         struct snd_soc_codec *pCodec = snd_kcontrol_chip(pKcontrol);
+#endif  
         struct tas2560_priv *pTAS2560 = snd_soc_codec_get_drvdata(pCodec);
 
         pUcontrol->value.integer.value[0] = pTAS2560->mnSamplingRate;
@@ -305,7 +318,11 @@ static int tas2560_get_Sampling_Rate(struct snd_kcontrol *pKcontrol,
 static int tas2560_set_Sampling_Rate(struct snd_kcontrol *pKcontrol,
                                 struct snd_ctl_elem_value *pUcontrol)
 {
+#ifdef KCONTROL_CODEC
+        struct snd_soc_codec *pCodec = snd_soc_kcontrol_codec(pKcontrol);
+#else
         struct snd_soc_codec *pCodec = snd_kcontrol_chip(pKcontrol);
+#endif          
         struct tas2560_priv *pTAS2560 = snd_soc_codec_get_drvdata(pCodec);
 
         int sampleRate = pUcontrol->value.integer.value[0];
@@ -318,7 +335,11 @@ static int tas2560_set_Sampling_Rate(struct snd_kcontrol *pKcontrol,
 static int tas2560_power_ctrl_get(struct snd_kcontrol *pKcontrol,
                                 struct snd_ctl_elem_value *pValue)
 {
+#ifdef KCONTROL_CODEC
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(pKcontrol);
+#else
         struct snd_soc_codec *codec = snd_kcontrol_chip(pKcontrol);
+#endif          
         struct tas2560_priv *pTAS2560 = snd_soc_codec_get_drvdata(codec);
 
         pValue->value.integer.value[0] = pTAS2560->mbPowerUp;
@@ -331,7 +352,11 @@ static int tas2560_power_ctrl_get(struct snd_kcontrol *pKcontrol,
 static int tas2560_power_ctrl_put(struct snd_kcontrol *pKcontrol,
                                 struct snd_ctl_elem_value *pValue)
 {
+#ifdef KCONTROL_CODEC
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(pKcontrol);
+#else
         struct snd_soc_codec *codec = snd_kcontrol_chip(pKcontrol);
+#endif                  
         struct tas2560_priv *pTAS2560 = snd_soc_codec_get_drvdata(codec);
 
         int bPowerUp = pValue->value.integer.value[0];
diff --git a/tas2560-core.c b/tas2560-core.c
index f2622fd..b4eb7c8 100755
--- a/tas2560-core.c
+++ b/tas2560-core.c
@@ -637,6 +637,7 @@ void tas2560_enable(struct tas2560_priv *pTAS2560, bool bEnable)
                         dev_dbg(pTAS2560->dev,"%s power down\n",__func__);
                         pTAS2560->update_bits(pTAS2560, channel_both, TAS2560_PWR_REG,
                                     TAS2560_PWR_BIT_MASK,0);
+                        mdelay(30);
                         pTAS2560->mbPowerUp = false;
                 }
         }