CHROMIUM: ALSA: hda: cirrus: Add pin configs for lumpy.

[cascardo/linux.git] / sound / pci / hda / patch_cirrus.c

diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index bc5a993..1c4a4bb 100644 (file)
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -88,6 +88,8 @@ enum {
 /* CS421x boards */
 enum {
        CS421X_CDB4210,
+       STUMPY_CDB4210,
+       LUMPY_CDB4210,
        CS421X_MODELS
 };
 
@@ -609,7 +611,7 @@ static int add_output(struct hda_codec *codec, hda_nid_t dac, int idx,
                "Front Speaker", "Surround Speaker", "Bass Speaker"
        };
        static const char * const line_outs[] = {
-               "Front Line-Out", "Surround Line-Out", "Bass Line-Out"
+               "Front Line Out", "Surround Line Out", "Bass Line Out"
        };
 
        fix_volume_caps(codec, dac);
@@ -635,7 +637,7 @@ static int add_output(struct hda_codec *codec, hda_nid_t dac, int idx,
                if (num_ctls > 1)
                        name = line_outs[idx];
                else
-                       name = "Line-Out";
+                       name = "Line Out";
                break;
        }
 
@@ -1443,6 +1445,8 @@ static int patch_cs420x(struct hda_codec *codec)
 /* CS4210 board names */
 static const char *cs421x_models[CS421X_MODELS] = {
        [CS421X_CDB4210] = "cdb4210",
+       [STUMPY_CDB4210] = "stumpy",
+       [LUMPY_CDB4210] = "lumpy",
 };
 
 static const struct snd_pci_quirk cs421x_cfg_tbl[] = {
@@ -1463,8 +1467,32 @@ static const struct cs_pincfg cdb4210_pincfgs[] = {
        {} /* terminator */
 };
 
+/* Stumpy */
+static struct cs_pincfg stumpy_pincfgs[] = {
+       { 0x05, 0x022120f0 },
+       { 0x06, 0x901700f0 },
+       { 0x07, 0x02a120f0 },
+       { 0x08, 0x77a70037 },
+       { 0x09, 0x77a6003e },
+       { 0x0a, 0x434510f0 },
+       {} /* terminator */
+};
+
+/* Lumpy */
+static struct cs_pincfg lumpy_pincfgs[] = {
+       { 0x05, 0x022110f0 },
+       { 0x06, 0x901700f0 },
+       { 0x07, 0x02a110f0 },
+       { 0x08, 0x77a70037 },
+       { 0x09, 0xb7a6003e },
+       { 0x0a, 0x400000f0 },
+       {} /* terminator */
+};
+
 static const struct cs_pincfg *cs421x_pincfgs[CS421X_MODELS] = {
        [CS421X_CDB4210] = cdb4210_pincfgs,
+       [STUMPY_CDB4210] = stumpy_pincfgs,
+       [LUMPY_CDB4210] = lumpy_pincfgs,
 };
 
 static const struct hda_verb cs421x_coef_init_verbs[] = {