ALSA: hda/realtek - Support low power consumption for ALC295

Enter to close more power control widgets at suspend.
Remove hp_pin check. Add the default pin 0x21 as headphone.
Supported low power consumption, it must do depop procedure when
headset jack was plugged or unplugged.
So, alc225_init() and alc225_shutup() must run delay when headset
jack was plugged or unplugged.
If depop procedure not run with delay, it will have a chance to let
power consumption raise high.

[ A few compile fixes by tiwai ]

Fixes: 8983eb602af5 ("ALSA: hda/realtek - Move to ACT_INIT state")
Signed-off-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 31 insertions, 15 deletions

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index d743f2b0e3cf..e733d323f1a7 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -119,6 +119,7 @@ struct alc_spec {
         unsigned int no_depop_delay:1;
         unsigned int done_hp_init:1;
         unsigned int no_shutup_pins:1;
+        unsigned int ultra_low_power:1;
 
         /* for PLL fix */
         hda_nid_t pll_nid;
@@ -3269,8 +3270,7 @@ static void alc225_init(struct hda_codec *codec)
         bool hp1_pin_sense, hp2_pin_sense;
 
         if (!hp_pin)
-                return;
-
+                hp_pin = 0x21;
         msleep(30);
 
         hp1_pin_sense = snd_hda_jack_detect(codec, hp_pin);
@@ -3280,25 +3280,31 @@ static void alc225_init(struct hda_codec *codec)
                 msleep(2);
 
         alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */
+        if (spec->ultra_low_power) {
+                alc_update_coef_idx(codec, 0x08, 0x0f << 2, 3<<2);
+                alc_update_coef_idx(codec, 0x0e, 7<<6, 7<<6);
+                alc_update_coef_idx(codec, 0x33, 1<<11, 0);
+                msleep(30);
+        }
 
-        if (hp1_pin_sense)
+        if (hp1_pin_sense || spec->ultra_low_power)
                 snd_hda_codec_write(codec, hp_pin, 0,
                             AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
         if (hp2_pin_sense)
                 snd_hda_codec_write(codec, 0x16, 0,
                             AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
 
-        if (hp1_pin_sense || hp2_pin_sense)
+        if (hp1_pin_sense || hp2_pin_sense || spec->ultra_low_power)
                 msleep(85);
 
-        if (hp1_pin_sense)
+        if (hp1_pin_sense || spec->ultra_low_power)
                 snd_hda_codec_write(codec, hp_pin, 0,
                             AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
         if (hp2_pin_sense)
                 snd_hda_codec_write(codec, 0x16, 0,
                             AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
 
-        if (hp1_pin_sense || hp2_pin_sense)
+        if (hp1_pin_sense || hp2_pin_sense || spec->ultra_low_power)
                 msleep(100);
 
         alc_update_coef_idx(codec, 0x4a, 3 << 10, 0);
@@ -3311,11 +3317,8 @@ static void alc225_shutup(struct hda_codec *codec)
         hda_nid_t hp_pin = alc_get_hp_pin(spec);
         bool hp1_pin_sense, hp2_pin_sense;
 
-        if (!hp_pin) {
-                alc269_shutup(codec);
-                return;
-        }
-
+        if (!hp_pin)
+                hp_pin = 0x21;
         /* 3k pull low control for Headset jack. */
         alc_update_coef_idx(codec, 0x4a, 0, 3 << 10);
 
@@ -3325,28 +3328,36 @@ static void alc225_shutup(struct hda_codec *codec)
         if (hp1_pin_sense || hp2_pin_sense)
                 msleep(2);
 
-        if (hp1_pin_sense)
+        if (hp1_pin_sense || spec->ultra_low_power)
                 snd_hda_codec_write(codec, hp_pin, 0,
                             AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
         if (hp2_pin_sense)
                 snd_hda_codec_write(codec, 0x16, 0,
                             AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
 
-        if (hp1_pin_sense || hp2_pin_sense)
+        if (hp1_pin_sense || hp2_pin_sense || spec->ultra_low_power)
                 msleep(85);
 
-        if (hp1_pin_sense)
+        if (hp1_pin_sense || spec->ultra_low_power)
                 snd_hda_codec_write(codec, hp_pin, 0,
                             AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
         if (hp2_pin_sense)
                 snd_hda_codec_write(codec, 0x16, 0,
                             AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
 
-        if (hp1_pin_sense || hp2_pin_sense)
+        if (hp1_pin_sense || hp2_pin_sense || spec->ultra_low_power)
                 msleep(100);
 
         alc_auto_setup_eapd(codec, false);
         alc_shutup_pins(codec);
+        if (spec->ultra_low_power) {
+                msleep(50);
+                alc_update_coef_idx(codec, 0x08, 0x0f << 2, 0x0c << 2);
+                alc_update_coef_idx(codec, 0x0e, 7<<6, 0);
+                alc_update_coef_idx(codec, 0x33, 1<<11, 1<<11);
+                alc_update_coef_idx(codec, 0x4a, 3<<4, 2<<4);
+                msleep(30);
+        }
 }
 
 static void alc_default_init(struct hda_codec *codec)
@@ -5526,7 +5537,12 @@ static void alc_fixup_headset_jack(struct hda_codec *codec,
 static void alc295_fixup_chromebook(struct hda_codec *codec,
                                     const struct hda_fixup *fix, int action)
 {
+        struct alc_spec *spec = codec->spec;
+
         switch (action) {
+        case HDA_FIXUP_ACT_PRE_PROBE:
+                spec->ultra_low_power = true;
+                break;
         case HDA_FIXUP_ACT_INIT:
                 switch (codec->core.vendor_id) {
                 case 0x10ec0295: