1 files changed, 99 insertions, 52 deletions

diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 488fd9ade1ba..26a1521045bb 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -51,7 +51,7 @@ struct cs_spec {
         unsigned int cur_adc_format;
         hda_nid_t dig_in;
 
-        struct hda_bind_ctls *capture_bind[2];
+        const struct hda_bind_ctls *capture_bind[2];
 
         unsigned int gpio_mask;
         unsigned int gpio_dir;
@@ -65,6 +65,7 @@ struct cs_spec {
 
 /* available models */
 enum {
+        CS420X_MBP53,
         CS420X_MBP55,
         CS420X_IMAC27,
         CS420X_AUTO,
@@ -230,7 +231,7 @@ static int cs_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
 
 /*
  */
-static struct hda_pcm_stream cs_pcm_analog_playback = {
+static const struct hda_pcm_stream cs_pcm_analog_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -241,7 +242,7 @@ static struct hda_pcm_stream cs_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream cs_pcm_analog_capture = {
+static const struct hda_pcm_stream cs_pcm_analog_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -251,7 +252,7 @@ static struct hda_pcm_stream cs_pcm_analog_capture = {
         },
 };
 
-static struct hda_pcm_stream cs_pcm_digital_playback = {
+static const struct hda_pcm_stream cs_pcm_digital_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -263,7 +264,7 @@ static struct hda_pcm_stream cs_pcm_digital_playback = {
         },
 };
 
-static struct hda_pcm_stream cs_pcm_digital_capture = {
+static const struct hda_pcm_stream cs_pcm_digital_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -329,12 +330,12 @@ static int is_ext_mic(struct hda_codec *codec, unsigned int idx)
 {
         struct cs_spec *spec = codec->spec;
         struct auto_pin_cfg *cfg = &spec->autocfg;
-        hda_nid_t pin = cfg->input_pins[idx];
-        unsigned int val = snd_hda_query_pin_caps(codec, pin);
-        if (!(val & AC_PINCAP_PRES_DETECT))
+        hda_nid_t pin = cfg->inputs[idx].pin;
+        unsigned int val;
+        if (!is_jack_detectable(codec, pin))
                 return 0;
         val = snd_hda_codec_get_pincfg(codec, pin);
-        return (get_defcfg_connect(val) == AC_JACK_PORT_COMPLEX);
+        return (snd_hda_get_input_pin_attr(val) != INPUT_PIN_ATTR_INT);
 }
 
 static hda_nid_t get_adc(struct hda_codec *codec, hda_nid_t pin,
@@ -348,8 +349,7 @@ static hda_nid_t get_adc(struct hda_codec *codec, hda_nid_t pin,
                 hda_nid_t pins[2];
                 unsigned int type;
                 int j, nums;
-                type = (get_wcaps(codec, nid) & AC_WCAP_TYPE)
-                        >> AC_WCAP_TYPE_SHIFT;
+                type = get_wcaps_type(get_wcaps(codec, nid));
                 if (type != AC_WID_AUD_IN)
                         continue;
                 nums = snd_hda_get_connections(codec, nid, pins,
@@ -424,10 +424,8 @@ static int parse_input(struct hda_codec *codec)
         struct auto_pin_cfg *cfg = &spec->autocfg;
         int i;
 
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t pin = cfg->input_pins[i];
-                if (!pin)
-                        continue;
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t pin = cfg->inputs[i].pin;
                 spec->input_idx[spec->num_inputs] = i;
                 spec->capsrc_idx[i] = spec->num_inputs++;
                 spec->cur_input = i;
@@ -438,16 +436,17 @@ static int parse_input(struct hda_codec *codec)
 
         /* check whether the automatic mic switch is available */
         if (spec->num_inputs == 2 &&
-            spec->adc_nid[AUTO_PIN_MIC] && spec->adc_nid[AUTO_PIN_FRONT_MIC]) {
-                if (is_ext_mic(codec, cfg->input_pins[AUTO_PIN_FRONT_MIC])) {
-                        if (!is_ext_mic(codec, cfg->input_pins[AUTO_PIN_MIC])) {
+            cfg->inputs[0].type == AUTO_PIN_MIC &&
+            cfg->inputs[1].type == AUTO_PIN_MIC) {
+                if (is_ext_mic(codec, cfg->inputs[0].pin)) {
+                        if (!is_ext_mic(codec, cfg->inputs[1].pin)) {
                                 spec->mic_detect = 1;
-                                spec->automic_idx = AUTO_PIN_FRONT_MIC;
+                                spec->automic_idx = 0;
                         }
                 } else {
-                        if (is_ext_mic(codec, cfg->input_pins[AUTO_PIN_MIC])) {
+                        if (is_ext_mic(codec, cfg->inputs[1].pin)) {
                                 spec->mic_detect = 1;
-                                spec->automic_idx = AUTO_PIN_MIC;
+                                spec->automic_idx = 1;
                         }
                 }
         }
@@ -490,7 +489,7 @@ static int parse_digital_input(struct hda_codec *codec)
  * create mixer controls
  */
 
-static const char *dir_sfx[2] = { "Playback", "Capture" };
+static const char * const dir_sfx[2] = { "Playback", "Capture" };
 
 static int add_mute(struct hda_codec *codec, const char *name, int index,
                     unsigned int pval, int dir, struct snd_kcontrol **kctlp)
@@ -559,10 +558,10 @@ static int add_output(struct hda_codec *codec, hda_nid_t dac, int idx,
         const char *name;
         int err, index;
         struct snd_kcontrol *kctl;
-        static char *speakers[] = {
+        static const char * const speakers[] = {
                 "Front Speaker", "Surround Speaker", "Bass Speaker"
         };
-        static char *line_outs[] = {
+        static const char * const line_outs[] = {
                 "Front Line-Out", "Surround Line-Out", "Bass Line-Out"
         };
 
@@ -642,7 +641,7 @@ static int build_output(struct hda_codec *codec)
 /*
  */
 
-static struct snd_kcontrol_new cs_capture_ctls[] = {
+static const struct snd_kcontrol_new cs_capture_ctls[] = {
         HDA_BIND_SW("Capture Switch", 0),
         HDA_BIND_VOL("Capture Volume", 0),
 };
@@ -674,6 +673,7 @@ static int cs_capture_source_info(struct snd_kcontrol *kcontrol,
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct cs_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
         unsigned int idx;
 
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
@@ -682,7 +682,8 @@ static int cs_capture_source_info(struct snd_kcontrol *kcontrol,
         if (uinfo->value.enumerated.item >= spec->num_inputs)
                 uinfo->value.enumerated.item = spec->num_inputs - 1;
         idx = spec->input_idx[uinfo->value.enumerated.item];
-        strcpy(uinfo->value.enumerated.name, auto_pin_cfg_labels[idx]);
+        strcpy(uinfo->value.enumerated.name,
+               hda_get_input_pin_label(codec, cfg->inputs[idx].pin, 1));
         return 0;
 }
 
@@ -708,7 +709,7 @@ static int cs_capture_source_put(struct snd_kcontrol *kcontrol,
         return change_cur_input(codec, idx, 0);
 }
 
-static struct snd_kcontrol_new cs_capture_source = {
+static const struct snd_kcontrol_new cs_capture_source = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "Capture Source",
         .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -717,7 +718,7 @@ static struct snd_kcontrol_new cs_capture_source = {
         .put = cs_capture_source_put,
 };
 
-static struct hda_bind_ctls *make_bind_capture(struct hda_codec *codec,
+static const struct hda_bind_ctls *make_bind_capture(struct hda_codec *codec,
                                                struct hda_ctl_ops *ops)
 {
         struct cs_spec *spec = codec->spec;
@@ -740,6 +741,27 @@ static struct hda_bind_ctls *make_bind_capture(struct hda_codec *codec,
         return bind;
 }
 
+/* add a (input-boost) volume control to the given input pin */
+static int add_input_volume_control(struct hda_codec *codec,
+                                    struct auto_pin_cfg *cfg,
+                                    int item)
+{
+        hda_nid_t pin = cfg->inputs[item].pin;
+        u32 caps;
+        const char *label;
+        struct snd_kcontrol *kctl;
+                
+        if (!(get_wcaps(codec, pin) & AC_WCAP_IN_AMP))
+                return 0;
+        caps = query_amp_caps(codec, pin, HDA_INPUT);
+        caps = (caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT;
+        if (caps <= 1)
+                return 0;
+        label = hda_get_autocfg_input_label(codec, cfg, item);
+        return add_volume(codec, label, 0,
+                          HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_INPUT), 1, &kctl);
+}
+
 static int build_input(struct hda_codec *codec)
 {
         struct cs_spec *spec = codec->spec;
@@ -779,6 +801,12 @@ static int build_input(struct hda_codec *codec)
                         return err;
         }
 
+        for (i = 0; i < spec->num_inputs; i++) {
+                err = add_input_volume_control(codec, &spec->autocfg, i);
+                if (err < 0)
+                        return err;
+        }
+
         return 0;
 }
 
@@ -818,15 +846,14 @@ static void cs_automute(struct hda_codec *codec)
 {
         struct cs_spec *spec = codec->spec;
         struct auto_pin_cfg *cfg = &spec->autocfg;
-        unsigned int caps, hp_present;
+        unsigned int hp_present;
         hda_nid_t nid;
         int i;
 
         hp_present = 0;
         for (i = 0; i < cfg->hp_outs; i++) {
                 nid = cfg->hp_pins[i];
-                caps = snd_hda_query_pin_caps(codec, nid);
-                if (!(caps & AC_PINCAP_PRES_DETECT))
+                if (!is_jack_detectable(codec, nid))
                         continue;
                 hp_present = snd_hda_jack_detect(codec, nid);
                 if (hp_present)
@@ -838,7 +865,8 @@ static void cs_automute(struct hda_codec *codec)
                                     AC_VERB_SET_PIN_WIDGET_CONTROL,
                                     hp_present ? 0 : PIN_OUT);
         }
-        if (spec->board_config == CS420X_MBP55 ||
+        if (spec->board_config == CS420X_MBP53 ||
+            spec->board_config == CS420X_MBP55 ||
             spec->board_config == CS420X_IMAC27) {
                 unsigned int gpio = hp_present ? 0x02 : 0x08;
                 snd_hda_codec_write(codec, 0x01, 0,
@@ -853,15 +881,12 @@ static void cs_automic(struct hda_codec *codec)
         hda_nid_t nid;
         unsigned int present;
         
-        nid = cfg->input_pins[spec->automic_idx];
+        nid = cfg->inputs[spec->automic_idx].pin;
         present = snd_hda_jack_detect(codec, nid);
         if (present)
                 change_cur_input(codec, spec->automic_idx, 0);
-        else {
-                unsigned int imic = (spec->automic_idx == AUTO_PIN_MIC) ?
-                        AUTO_PIN_FRONT_MIC : AUTO_PIN_MIC;
-                change_cur_input(codec, imic, 0);
-        }
+        else
+                change_cur_input(codec, !spec->automic_idx, 0);
 }
 
 /*
@@ -897,7 +922,7 @@ static void init_output(struct hda_codec *codec)
                                     AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP);
                 if (!cfg->speaker_outs)
                         continue;
-                if (get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP) {
+                if (is_jack_detectable(codec, nid)) {
                         snd_hda_codec_write(codec, nid, 0,
                                             AC_VERB_SET_UNSOLICITED_ENABLE,
                                             AC_USRSP_EN | HP_EVENT);
@@ -918,14 +943,14 @@ static void init_input(struct hda_codec *codec)
         unsigned int coef;
         int i;
 
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
+        for (i = 0; i < cfg->num_inputs; i++) {
                 unsigned int ctl;
-                hda_nid_t pin = cfg->input_pins[i];
-                if (!pin || !spec->adc_nid[i])
+                hda_nid_t pin = cfg->inputs[i].pin;
+                if (!spec->adc_nid[i])
                         continue;
                 /* set appropriate pin control and mute first */
                 ctl = PIN_IN;
-                if (i <= AUTO_PIN_FRONT_MIC) {
+                if (cfg->inputs[i].type == AUTO_PIN_MIC) {
                         unsigned int caps = snd_hda_query_pin_caps(codec, pin);
                         caps >>= AC_PINCAP_VREF_SHIFT;
                         if (caps & AC_PINCAP_VREF_80)
@@ -956,7 +981,7 @@ static void init_input(struct hda_codec *codec)
         cs_vendor_coef_set(codec, IDX_ADC_CFG, coef);
 }
 
-static struct hda_verb cs_coef_init_verbs[] = {
+static const struct hda_verb cs_coef_init_verbs[] = {
         {0x11, AC_VERB_SET_PROC_STATE, 1},
         {0x11, AC_VERB_SET_COEF_INDEX, IDX_DAC_CFG},
         {0x11, AC_VERB_SET_PROC_COEF,
@@ -990,7 +1015,7 @@ static struct hda_verb cs_coef_init_verbs[] = {
  * blocks, which will alleviate the issue.
  */
 
-static struct hda_verb cs_errata_init_verbs[] = {
+static const struct hda_verb cs_errata_init_verbs[] = {
         {0x01, AC_VERB_SET_POWER_STATE, 0x00}, /* AFG: D0 */
         {0x11, AC_VERB_SET_PROC_STATE, 0x01},  /* VPW: processing on */
 
@@ -1012,9 +1037,11 @@ static struct hda_verb cs_errata_init_verbs[] = {
         {0x11, AC_VERB_SET_PROC_COEF, 0x0008},
         {0x11, AC_VERB_SET_PROC_STATE, 0x00},
 
+#if 0 /* Don't to set to D3 as we are in power-up sequence */
         {0x07, AC_VERB_SET_POWER_STATE, 0x03}, /* S/PDIF Rx: D3 */
         {0x08, AC_VERB_SET_POWER_STATE, 0x03}, /* S/PDIF Tx: D3 */
         /*{0x01, AC_VERB_SET_POWER_STATE, 0x03},*/ /* AFG: D3 This is already handled */
+#endif
 
         {} /* terminator */
 };
@@ -1097,7 +1124,7 @@ static void cs_unsol_event(struct hda_codec *codec, unsigned int res)
         }
 }
 
-static struct hda_codec_ops cs_patch_ops = {
+static const struct hda_codec_ops cs_patch_ops = {
         .build_controls = cs_build_controls,
         .build_pcms = cs_build_pcms,
         .init = cs_init,
@@ -1129,15 +1156,19 @@ static int cs_parse_auto_config(struct hda_codec *codec)
         return 0;
 }
 
-static const char *cs420x_models[CS420X_MODELS] = {
+static const char * const cs420x_models[CS420X_MODELS] = {
+        [CS420X_MBP53] = "mbp53",
         [CS420X_MBP55] = "mbp55",
         [CS420X_IMAC27] = "imac27",
         [CS420X_AUTO] = "auto",
 };
 
 
-static struct snd_pci_quirk cs420x_cfg_tbl[] = {
+static const struct snd_pci_quirk cs420x_cfg_tbl[] = {
+        SND_PCI_QUIRK(0x10de, 0x0ac0, "MacBookPro 5,3", CS420X_MBP53),
+        SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55),
         SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),
+        SND_PCI_QUIRK(0x10de, 0xcb89, "MacBookPro 7,1", CS420X_MBP55),
         SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),
         {} /* terminator */
 };
@@ -1147,7 +1178,21 @@ struct cs_pincfg {
         u32 val;
 };
 
-static struct cs_pincfg mbp55_pincfgs[] = {
+static const struct cs_pincfg mbp53_pincfgs[] = {
+        { 0x09, 0x012b4050 },
+        { 0x0a, 0x90100141 },
+        { 0x0b, 0x90100140 },
+        { 0x0c, 0x018b3020 },
+        { 0x0d, 0x90a00110 },
+        { 0x0e, 0x400000f0 },
+        { 0x0f, 0x01cbe030 },
+        { 0x10, 0x014be060 },
+        { 0x12, 0x400000f0 },
+        { 0x15, 0x400000f0 },
+        {} /* terminator */
+};
+
+static const struct cs_pincfg mbp55_pincfgs[] = {
         { 0x09, 0x012b4030 },
         { 0x0a, 0x90100121 },
         { 0x0b, 0x90100120 },
@@ -1161,7 +1206,7 @@ static struct cs_pincfg mbp55_pincfgs[] = {
         {} /* terminator */
 };
 
-static struct cs_pincfg imac27_pincfgs[] = {
+static const struct cs_pincfg imac27_pincfgs[] = {
         { 0x09, 0x012b4050 },
         { 0x0a, 0x90100140 },
         { 0x0b, 0x90100142 },
@@ -1175,7 +1220,8 @@ static struct cs_pincfg imac27_pincfgs[] = {
         {} /* terminator */
 };
 
-static struct cs_pincfg *cs_pincfgs[CS420X_MODELS] = {
+static const struct cs_pincfg *cs_pincfgs[CS420X_MODELS] = {
+        [CS420X_MBP53] = mbp53_pincfgs,
         [CS420X_MBP55] = mbp55_pincfgs,
         [CS420X_IMAC27] = imac27_pincfgs,
 };
@@ -1208,6 +1254,7 @@ static int patch_cs420x(struct hda_codec *codec)
 
         switch (spec->board_config) {
         case CS420X_IMAC27:
+        case CS420X_MBP53:
         case CS420X_MBP55:
                 /* GPIO1 = headphones */
                 /* GPIO3 = speakers */
@@ -1234,7 +1281,7 @@ static int patch_cs420x(struct hda_codec *codec)
 /*
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_cirrus[] = {
+static const struct hda_codec_preset snd_hda_preset_cirrus[] = {
         { .id = 0x10134206, .name = "CS4206", .patch = patch_cs420x },
         { .id = 0x10134207, .name = "CS4207", .patch = patch_cs420x },
         {} /* terminator */