revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / sound / pci / hda / patch_sigmatel.c

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 78f12064b2bf93550350e57e6b067f2ce06ed6f0..c16c5ba0fda0fe61387d6924a6b84307b0dedcbb 100644 (file)
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -93,7 +93,6 @@ enum {
        STAC_92HD83XXX_REF,
        STAC_92HD83XXX_PWR_REF,
        STAC_DELL_S14,
-       STAC_DELL_E6410,
        STAC_92HD83XXX_HP,
        STAC_HP_DV7_4000,
        STAC_92HD83XXX_MODELS
@@ -1619,8 +1618,6 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {
 static struct snd_pci_quirk stac92hd73xx_codec_id_cfg_tbl[] = {
        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a1,
                      "Alienware M17x", STAC_ALIENWARE_M17X),
-       SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x043a,
-                     "Alienware M17x", STAC_ALIENWARE_M17X),
        {} /* terminator */
 };
 
@@ -1636,13 +1633,6 @@ static unsigned int dell_s14_pin_configs[10] = {
        0x40f000f0, 0x40f000f0,
 };
 
-/* Deliberately turn off 0x0f (Dock Mic) to make it choose Int Mic instead */
-static unsigned int dell_e6410_pin_configs[10] = {
-       0x04a11020, 0x0421101f, 0x400000f0, 0x90170110,
-       0x23011050, 0x40f000f0, 0x400000f0, 0x90a60130,
-       0x40f000f0, 0x40f000f0,
-};
-
 static unsigned int hp_dv7_4000_pin_configs[10] = {
        0x03a12050, 0x0321201f, 0x40f000f0, 0x90170110,
        0x40f000f0, 0x40f000f0, 0x90170110, 0xd5a30140,
@@ -1653,7 +1643,6 @@ static unsigned int *stac92hd83xxx_brd_tbl[STAC_92HD83XXX_MODELS] = {
        [STAC_92HD83XXX_REF] = ref92hd83xxx_pin_configs,
        [STAC_92HD83XXX_PWR_REF] = ref92hd83xxx_pin_configs,
        [STAC_DELL_S14] = dell_s14_pin_configs,
-       [STAC_DELL_E6410] = dell_e6410_pin_configs,
        [STAC_HP_DV7_4000] = hp_dv7_4000_pin_configs,
 };
 
@@ -1662,7 +1651,6 @@ static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
        [STAC_92HD83XXX_REF] = "ref",
        [STAC_92HD83XXX_PWR_REF] = "mic-ref",
        [STAC_DELL_S14] = "dell-s14",
-       [STAC_DELL_E6410] = "dell-e6410",
        [STAC_92HD83XXX_HP] = "hp",
        [STAC_HP_DV7_4000] = "hp-dv7-4000",
 };
@@ -1675,10 +1663,6 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
                      "DFI LanParty", STAC_92HD83XXX_REF),
        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02ba,
                      "unknown Dell", STAC_DELL_S14),
-       SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x040a,
-                     "Dell E6410", STAC_DELL_E6410),
-       SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x040b,
-                     "Dell E6510", STAC_DELL_E6410),
        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x3600,
                      "HP", STAC_92HD83XXX_HP),
        {} /* terminator */