Changeset 598 for GPL/trunk/alsa-kernel/pci/intel8x0.c
- Timestamp:
- Apr 3, 2017, 4:51:56 PM (8 years ago)
- Location:
- GPL/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
GPL/trunk
-
Property svn:mergeinfo
set to
/GPL/branches/uniaud32-2.1.x merged eligible
-
Property svn:mergeinfo
set to
-
GPL/trunk/alsa-kernel/pci/intel8x0.c
r522 r598 97 97 98 98 /* just for backward compatibility */ 99 static int enable;99 //static int enable; 100 100 module_param(enable, bool, 0444); 101 static int joystick;101 //static int joystick; 102 102 module_param(joystick, int, 0444); 103 103 … … 421 421 }; 422 422 423 static struct pci_device_id snd_intel8x0_ids[]= {423 static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0_ids) = { 424 424 { PCI_VDEVICE(INTEL, 0x2415), DEVICE_INTEL }, /* 82801AA */ 425 425 { PCI_VDEVICE(INTEL, 0x2425), DEVICE_INTEL }, /* 82901AB */ … … 717 717 * which aborts PCI busmaster for audio transfer. A workaround is to set 718 718 * the pages as non-cached. For details, see the errata in 719 * http:// www.intel.com/design/chipsets/specupdt/245051.htm719 * http://download.intel.com/design/chipsets/specupdt/24505108.pdf 720 720 */ 721 721 static void fill_nocache(void *buf, int size, int nocache) … … 1779 1779 { 1780 1780 .subvendor = 0x1014, 1781 .subdevice = 0x0534, 1782 .name = "ThinkPad X31", 1783 .type = AC97_TUNE_INV_EAPD 1784 }, 1785 { 1786 .subvendor = 0x1014, 1781 1787 .subdevice = 0x1f00, 1782 1788 .name = "MS-9128", … … 1839 1845 { 1840 1846 .subvendor = 0x1028, 1847 .subdevice = 0x0151, 1848 .name = "Dell Optiplex GX270", /* AD1981B */ 1849 .type = AC97_TUNE_HP_ONLY 1850 }, 1851 { 1852 .subvendor = 0x1028, 1841 1853 .subdevice = 0x014e, 1842 1854 .name = "Dell D800", /* STAC9750/51 */ 1843 .type = AC97_TUNE_HP_ONLY1844 },1845 {1846 .subvendor = 0x1028,1847 .subdevice = 0x0151,1848 .name = "Dell Optiplex GX270", /* AD1981B */1849 1855 .type = AC97_TUNE_HP_ONLY 1850 1856 }, … … 1859 1865 .subdevice = 0x016a, 1860 1866 .name = "Dell Inspiron 8600", /* STAC9750/51 */ 1867 .type = AC97_TUNE_HP_ONLY 1868 }, 1869 { 1870 .subvendor = 0x1028, 1871 .subdevice = 0x0182, 1872 .name = "Dell Latitude D610", /* STAC9750/51 */ 1861 1873 .type = AC97_TUNE_HP_ONLY 1862 1874 }, … … 1905 1917 { 1906 1918 .subvendor = 0x103c, 1907 .subdevice = 0x 0934,1908 .name = "HP nc8220",1909 .type = AC97_TUNE_HP_ MUTE_LED1919 .subdevice = 0x129d, 1920 .name = "HP xw8000", 1921 .type = AC97_TUNE_HP_ONLY 1910 1922 }, 1911 1923 { … … 1917 1929 { 1918 1930 .subvendor = 0x103c, 1931 .subdevice = 0x099c, 1932 .name = "HP nx6110/nc6120", 1933 .type = AC97_TUNE_HP_MUTE_LED 1934 }, 1935 { 1936 .subvendor = 0x103c, 1919 1937 .subdevice = 0x0944, 1920 1938 .name = "HP nc6220", … … 1923 1941 { 1924 1942 .subvendor = 0x103c, 1925 .subdevice = 0x09 9c,1926 .name = "HP n x6110/nc6120",1943 .subdevice = 0x0934, 1944 .name = "HP nc8220", 1927 1945 .type = AC97_TUNE_HP_MUTE_LED 1928 },1929 {1930 .subvendor = 0x103c,1931 .subdevice = 0x129d,1932 .name = "HP xw8000",1933 .type = AC97_TUNE_HP_ONLY1934 1946 }, 1935 1947 { … … 1953 1965 { 1954 1966 .subvendor = 0x104d, 1967 .subdevice = 0x8144, 1968 .name = "Sony", 1969 .type = AC97_TUNE_INV_EAPD 1970 }, 1971 { 1972 .subvendor = 0x104d, 1955 1973 .subdevice = 0x8197, 1956 1974 .name = "Sony S1XP", 1975 .type = AC97_TUNE_INV_EAPD 1976 }, 1977 { 1978 .subvendor = 0x104d, 1979 .subdevice = 0x81c0, 1980 .name = "Sony VAIO VGN-T350P", /*AD1981B*/ 1981 .type = AC97_TUNE_INV_EAPD 1982 }, 1983 { 1984 .subvendor = 0x104d, 1985 .subdevice = 0x81c5, 1986 .name = "Sony VAIO VGN-B1VP", /*AD1981B*/ 1957 1987 .type = AC97_TUNE_INV_EAPD 1958 1988 }, … … 2048 2078 }, 2049 2079 { 2080 .subvendor = 0x161f, 2081 .subdevice = 0x203a, 2082 .name = "Gateway 4525GZ", /* AD1981B */ 2083 .type = AC97_TUNE_INV_EAPD 2084 }, 2085 { 2050 2086 .subvendor = 0x1734, 2051 2087 .subdevice = 0x0088, … … 2057 2093 .subdevice = 0x0111, 2058 2094 .name = "Gateway 2000 ICH2/AD1885", 2059 .type = AC97_TUNE_HP_ONLY2060 },2061 {2062 .subvendor = 0x8086,2063 .subdevice = 0x0104,2064 .name = "Intel D845GEBV2", /* AD1981B */2065 2095 .type = AC97_TUNE_HP_ONLY 2066 2096 }, … … 2780 2810 t *= 1000000; 2781 2811 t += (stop_time.tv_nsec - start_time.tv_nsec) / 1000; 2782 printk(KERN_INFO "%s: measured %lu usecs (%lu samples)\n", __func__, t, pos);2812 dprintf(("%s: measured %lu usecs (%lu samples)\n", __func__, t, pos)); 2783 2813 if (t == 0) { 2784 2814 snd_printk(KERN_ERR "intel8x0: ?? calculation error..\n"); … … 2801 2831 chip->ac97_bus->clock = (chip->ac97_bus->clock * 48000) / pos; 2802 2832 __end: 2803 printk(KERN_INFO "intel8x0: clocking to %d\n", chip->ac97_bus->clock);2833 dprintf(("intel8x0: clocking to %d\n", chip->ac97_bus->clock)); 2804 2834 snd_ac97_update_power(chip->ac97[0], AC97_PCM_FRONT_DAC_RATE, 0); 2805 2835 } … … 3134 3164 }; 3135 3165 3166 #ifdef NOT_USED 3136 3167 static struct snd_pci_quirk spdif_aclink_defaults[] __devinitdata = { 3137 3168 SND_PCI_QUIRK(0x147b, 0x1c1a, "ASUS KN8", 1), 3138 3169 {0} /* end */ 3139 3170 }; 3171 #endif 3140 3172 3141 3173 /* look up white/black list for SPDIF over ac-link */
Note:
See TracChangeset
for help on using the changeset viewer.