[Codec] Add higher preference to dac_mute when tas2562_mute is called after.SamsungLSI_K4.19

If dac_mute is called with mute and then tas256_mute unmute is called,
then dac_mute has higher preference and device will be in mute
unless dac_mute with unmute is called.
	a. Add condition check before power up to check dac_mute flag.
	b. do register write in dac_mute only if device is in playback state
	(TAS2562_POWER_ACTIVE)

1 files changed, 31 insertions, 18 deletions

diff --git a/tas2562-codec.c b/tas2562-codec.c
index 453fd87..938aba4 100644
--- a/tas2562-codec.c
+++ b/tas2562-codec.c
@@ -453,14 +453,25 @@ static int tas2562_set_power_state(struct tas2562_priv *p_tas2562,
                         TAS2562_INTERRUPTMASKREG1_DISABLE);
 
                 /*Power up sequence*/
-                n_result = p_tas2562->update_bits(p_tas2562,
-                        chn, TAS2562_POWERCONTROL,
-                        TAS2562_POWERCONTROL_OPERATIONALMODE10_MASK |
-                        TAS2562_POWERCONTROL_ISNSPOWER_MASK |
-                        TAS2562_POWERCONTROL_VSNSPOWER_MASK,
-                        TAS2562_POWERCONTROL_OPERATIONALMODE10_ACTIVE |
-                        TAS2562_POWERCONTROL_ISNSPOWER_ACTIVE |
-                        TAS2562_POWERCONTROL_VSNSPOWER_ACTIVE);
+                if (p_tas2562->dac_mute == 0) {
+                        n_result = p_tas2562->update_bits(p_tas2562,
+                                chn, TAS2562_POWERCONTROL,
+                                TAS2562_POWERCONTROL_OPERATIONALMODE10_MASK |
+                                TAS2562_POWERCONTROL_ISNSPOWER_MASK |
+                                TAS2562_POWERCONTROL_VSNSPOWER_MASK,
+                                TAS2562_POWERCONTROL_OPERATIONALMODE10_ACTIVE |
+                                TAS2562_POWERCONTROL_ISNSPOWER_ACTIVE |
+                                TAS2562_POWERCONTROL_VSNSPOWER_ACTIVE);
+                } else {
+                        n_result = p_tas2562->update_bits(p_tas2562,
+                                chn, TAS2562_POWERCONTROL,
+                                TAS2562_POWERCONTROL_OPERATIONALMODE10_MASK |
+                                TAS2562_POWERCONTROL_ISNSPOWER_MASK |
+                                TAS2562_POWERCONTROL_VSNSPOWER_MASK,
+                                TAS2562_POWERCONTROL_OPERATIONALMODE10_MUTE |
+                                TAS2562_POWERCONTROL_ISNSPOWER_ACTIVE |
+                                TAS2562_POWERCONTROL_VSNSPOWER_ACTIVE);                 
+                }
 
                 dev_info(p_tas2562->dev, "set ICN to -80dB\n");
                 n_result = p_tas2562->bulk_write(p_tas2562, chn,
@@ -1412,16 +1423,18 @@ static int tas2562_dac_mute_ctrl_put(struct snd_kcontrol *pKcontrol,
         else
                 chn = channel_left;
 
-        if (mute) {
-                n_result = p_tas2562->update_bits(p_tas2562, chn,
-                TAS2562_POWERCONTROL,
-                TAS2562_POWERCONTROL_OPERATIONALMODE10_MASK,
-                TAS2562_POWERCONTROL_OPERATIONALMODE10_MUTE);
-        } else {
-                n_result = p_tas2562->update_bits(p_tas2562, chn,
-                TAS2562_POWERCONTROL,
-                TAS2562_POWERCONTROL_OPERATIONALMODE10_MASK,
-                TAS2562_POWERCONTROL_OPERATIONALMODE10_ACTIVE);
+        if (p_tas2562->mn_power_state == TAS2562_POWER_ACTIVE) {
+                if (mute) {
+                        n_result = p_tas2562->update_bits(p_tas2562, chn,
+                        TAS2562_POWERCONTROL,
+                        TAS2562_POWERCONTROL_OPERATIONALMODE10_MASK,
+                        TAS2562_POWERCONTROL_OPERATIONALMODE10_MUTE);
+                } else {
+                        n_result = p_tas2562->update_bits(p_tas2562, chn,
+                        TAS2562_POWERCONTROL,
+                        TAS2562_POWERCONTROL_OPERATIONALMODE10_MASK,
+                        TAS2562_POWERCONTROL_OPERATIONALMODE10_ACTIVE);
+                }
         }
 
         p_tas2562->dac_mute = mute;