Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 0c27c1805269f9ff01cc1d77752a662065ebcfe5

Authored by Vitaliy Kulikov
Committed by Takashi Iwai
1 parent acb03d440b
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ALSA: hda - Add support of the 4 internal speakers on certain HP laptops 

Signed-off-by: Vitaliy Kulikov <Vitaliy.Kulikov@idt.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 50 additions and 1 deletions Side-by-side Diff

sound/pci/hda/patch_sigmatel.c
Diff comments   View file @ 0c27c18
... ... @@ -95,6 +95,7 @@
95 95 STAC_92HD83XXX_PWR_REF,
96 96 STAC_DELL_S14,
97 97 STAC_92HD83XXX_HP,
  98 + STAC_92HD83XXX_HP_cNB11_INTQUAD,
98 99 STAC_HP_DV7_4000,
99 100 STAC_92HD83XXX_MODELS
100 101 };
101 102  
... ... @@ -1636,10 +1637,17 @@
1636 1637 0x40f000f0, 0x40f000f0,
1637 1638 };
1638 1639  
  1640 +static const unsigned int hp_cNB11_intquad_pin_configs[10] = {
  1641 + 0x40f000f0, 0x0221101f, 0x02a11020, 0x92170110,
  1642 + 0x40f000f0, 0x92170110, 0x40f000f0, 0xd5a30130,
  1643 + 0x40f000f0, 0x40f000f0,
  1644 +};
  1645 +
1639 1646 static const unsigned int *stac92hd83xxx_brd_tbl[STAC_92HD83XXX_MODELS] = {
1640 1647 [STAC_92HD83XXX_REF] = ref92hd83xxx_pin_configs,
1641 1648 [STAC_92HD83XXX_PWR_REF] = ref92hd83xxx_pin_configs,
1642 1649 [STAC_DELL_S14] = dell_s14_pin_configs,
  1650 + [STAC_92HD83XXX_HP_cNB11_INTQUAD] = hp_cNB11_intquad_pin_configs,
1643 1651 [STAC_HP_DV7_4000] = hp_dv7_4000_pin_configs,
1644 1652 };
1645 1653  
... ... @@ -1649,6 +1657,7 @@
1649 1657 [STAC_92HD83XXX_PWR_REF] = "mic-ref",
1650 1658 [STAC_DELL_S14] = "dell-s14",
1651 1659 [STAC_92HD83XXX_HP] = "hp",
  1660 + [STAC_92HD83XXX_HP_cNB11_INTQUAD] = "hp_cNB11_intquad",
1652 1661 [STAC_HP_DV7_4000] = "hp-dv7-4000",
1653 1662 };
1654 1663  
... ... @@ -1661,7 +1670,47 @@
1661 1670 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02ba,
1662 1671 "unknown Dell", STAC_DELL_S14),
1663 1672 SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x3600,
1664   - "HP", STAC_92HD83XXX_HP),
  1673 + "HP", STAC_92HD83XXX_HP),
  1674 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1656,
  1675 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1676 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1657,
  1677 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1678 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1658,
  1679 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1680 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1659,
  1681 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1682 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x165A,
  1683 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1684 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x165B,
  1685 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1686 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3388,
  1687 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1688 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3389,
  1689 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1690 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x355B,
  1691 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1692 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x355C,
  1693 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1694 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x355D,
  1695 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1696 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x355E,
  1697 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1698 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x355F,
  1699 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1700 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3560,
  1701 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1702 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x358B,
  1703 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1704 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x358C,
  1705 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1706 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x358D,
  1707 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1708 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3591,
  1709 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1710 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3592,
  1711 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
  1712 + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3593,
  1713 + "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
1665 1714 {} /* terminator */
1666 1715 };
1667 1716