diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-28 12:11:43 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-28 12:11:43 +0100 |
commit | eab69121e36170e4ceb55465a76c67981c29cf16 (patch) | |
tree | aa56b5ed0a532fc605639382997481d32d9eb465 | |
parent | 8e3b2b5287fb684b27a64b5391ff0d7d532c56a2 (diff) | |
parent | 0a12d34fb0cb0d3b80404a73f4c741a8a963ed74 (diff) | |
download | alsa-driver-build-unstable-eab69121e36170e4ceb55465a76c67981c29cf16.tar.gz |
Merge remote-tracking branch 'stable/build' into build
-rw-r--r-- | alsa/pci/bt87x.patch | 20 | ||||
-rw-r--r-- | alsa/pci/ca0106/ca0106_main.patch | 10 | ||||
-rw-r--r-- | alsa/pci/emu10k1/emu10k1_main.patch | 8 | ||||
-rw-r--r-- | alsa/pci/emu10k1/emu10k1x.patch | 10 | ||||
-rw-r--r-- | alsa/pci/hda/hda_intel.patch | 36 | ||||
-rw-r--r-- | alsa/pci/pdplus/pdplus.c | 10 | ||||
-rw-r--r-- | alsa/usb/card.patch | 22 | ||||
-rw-r--r-- | alsa/usb/quirks.patch | 30 |
8 files changed, 73 insertions, 73 deletions
diff --git a/alsa/pci/bt87x.patch b/alsa/pci/bt87x.patch index 28a69e45e..0460892e3 100644 --- a/alsa/pci/bt87x.patch +++ b/alsa/pci/bt87x.patch @@ -1,11 +1,11 @@ ---- ../alsa-kernel/pci/bt87x.c 2013-02-25 10:03:33.000000000 +0100 -+++ bt87x.c 2013-03-04 10:02:33.416976274 +0100 +--- ../alsa-kernel/pci/bt87x.c 2014-02-28 11:55:48.986258632 +0100 ++++ bt87x.c 2014-02-28 11:57:17.960731051 +0100 @@ -1,3 +1,4 @@ +#include "adriver.h" /* * bt87x.c - Brooktree Bt878/Bt879 driver for ALSA * -@@ -843,21 +844,33 @@ +@@ -850,14 +851,26 @@ { int i; const struct pci_device_id *supported; @@ -31,19 +31,19 @@ - blacklist[i].subdevice == pci->subsystem_device) { + if (blacklist[i].subvendor == subsystem_vendor && + blacklist[i].subdevice == subsystem_device) { - snd_printdd(KERN_INFO "card %#04x-%#04x:%#04x has no audio\n", -- pci->device, pci->subsystem_vendor, pci->subsystem_device); -+ pci->device, subsystem_vendor, subsystem_device); - return -EBUSY; + dev_dbg(&pci->dev, + "card %#04x-%#04x:%#04x has no audio\n", + pci->device, pci->subsystem_vendor, pci->subsystem_device); +@@ -865,7 +878,7 @@ } - snd_printk(KERN_INFO "unknown card %#04x-%#04x:%#04x\n", + dev_info(&pci->dev, "unknown card %#04x-%#04x:%#04x\n", - pci->device, pci->subsystem_vendor, pci->subsystem_device); + pci->device, subsystem_vendor, subsystem_device); - snd_printk(KERN_DEBUG "please mail id, board name, and, " + dev_info(&pci->dev, "please mail id, board name, and, " "if it works, the correct digital_rate option to " "<alsa-devel@alsa-project.org>\n"); -@@ -985,3 +998,5 @@ +@@ -993,3 +1006,5 @@ module_init(alsa_card_bt87x_init) module_exit(alsa_card_bt87x_exit) diff --git a/alsa/pci/ca0106/ca0106_main.patch b/alsa/pci/ca0106/ca0106_main.patch index c7b935b7e..e302227dc 100644 --- a/alsa/pci/ca0106/ca0106_main.patch +++ b/alsa/pci/ca0106/ca0106_main.patch @@ -1,5 +1,5 @@ ---- ../../alsa-kernel/pci/ca0106/ca0106_main.c 2012-04-24 12:18:48.000000000 +0200 -+++ ca0106_main.c 2012-04-24 12:34:43.000000000 +0200 +--- ../../alsa-kernel/pci/ca0106/ca0106_main.c 2014-02-28 11:55:48.988258665 +0100 ++++ ca0106_main.c 2014-02-28 11:58:00.274430975 +0100 @@ -1,3 +1,4 @@ +#include "adriver.h" /* @@ -14,16 +14,16 @@ static struct snd_ca0106_details ca0106_chip_details[] = { /* Sound Blaster X-Fi Extreme Audio. This does not have an AC97. 53SB079000000 */ -@@ -1685,7 +1686,7 @@ +@@ -1723,7 +1724,7 @@ pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial); pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model); - printk(KERN_INFO "snd-ca0106: Model %04x Rev %08x Serial %08x\n", + dev_info(card->dev, "Model %04x Rev %08x Serial %08x\n", - chip->model, pci->revision, chip->serial); + chip->model, snd_pci_revision(pci), chip->serial); strcpy(card->driver, "CA0106"); strcpy(card->shortname, "CA0106"); -@@ -1944,3 +1945,5 @@ +@@ -1986,3 +1987,5 @@ }; module_pci_driver(ca0106_driver); diff --git a/alsa/pci/emu10k1/emu10k1_main.patch b/alsa/pci/emu10k1/emu10k1_main.patch index 5a3ab9648..2ec7ebaae 100644 --- a/alsa/pci/emu10k1/emu10k1_main.patch +++ b/alsa/pci/emu10k1/emu10k1_main.patch @@ -1,12 +1,12 @@ ---- ../../alsa-kernel/pci/emu10k1/emu10k1_main.c 2012-11-22 21:23:16.000000000 +0100 -+++ emu10k1_main.c 2012-11-23 17:49:52.000000000 +0100 +--- ../../alsa-kernel/pci/emu10k1/emu10k1_main.c 2014-02-28 11:55:49.002258896 +0100 ++++ emu10k1_main.c 2014-02-28 12:05:19.760690898 +0100 @@ -1,3 +1,5 @@ +#define __NO_VERSION__ +#include "adriver.h" /* * Copyright (c) by Jaroslav Kysela <perex@perex.cz> * Creative Labs, Inc. -@@ -1772,7 +1774,7 @@ +@@ -1818,7 +1820,7 @@ emu->synth = NULL; emu->get_synth_voice = NULL; /* read revision & serial */ @@ -14,4 +14,4 @@ + emu->revision = snd_pci_revision(pci); pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &emu->serial); pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &emu->model); - snd_printdd("vendor = 0x%x, device = 0x%x, subsystem_vendor_id = 0x%x, subsystem_id = 0x%x\n", pci->vendor, pci->device, emu->serial, emu->model); + dev_dbg(card->dev, diff --git a/alsa/pci/emu10k1/emu10k1x.patch b/alsa/pci/emu10k1/emu10k1x.patch index 6a154988c..1b8761e6a 100644 --- a/alsa/pci/emu10k1/emu10k1x.patch +++ b/alsa/pci/emu10k1/emu10k1x.patch @@ -1,11 +1,11 @@ ---- ../../alsa-kernel/pci/emu10k1/emu10k1x.c 2012-04-24 12:18:48.000000000 +0200 -+++ emu10k1x.c 2012-04-24 12:35:32.000000000 +0200 +--- ../../alsa-kernel/pci/emu10k1/emu10k1x.c 2014-02-28 11:55:49.003258913 +0100 ++++ emu10k1x.c 2014-02-28 12:05:19.777691178 +0100 @@ -1,3 +1,4 @@ +#include "adriver.h" /* * Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com> * Driver EMU10K1X chips -@@ -940,7 +941,7 @@ +@@ -967,7 +968,7 @@ pci_set_master(pci); /* read revision & serial */ @@ -13,8 +13,8 @@ + chip->revision = snd_pci_revision(pci); pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial); pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model); - snd_printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip->model, -@@ -1620,3 +1621,5 @@ + dev_info(card->dev, "Model %04x Rev %08x Serial %08x\n", chip->model, +@@ -1649,3 +1650,5 @@ }; module_pci_driver(emu10k1x_driver); diff --git a/alsa/pci/hda/hda_intel.patch b/alsa/pci/hda/hda_intel.patch index 50c18e5fa..5f73c6b65 100644 --- a/alsa/pci/hda/hda_intel.patch +++ b/alsa/pci/hda/hda_intel.patch @@ -1,5 +1,5 @@ ---- ../../alsa-kernel/pci/hda/hda_intel.c 2014-02-27 09:34:52.313696856 +0100 -+++ hda_intel.c 2014-02-27 09:40:13.092698944 +0100 +--- ../../alsa-kernel/pci/hda/hda_intel.c 2014-02-28 09:00:39.850804004 +0100 ++++ hda_intel.c 2014-02-28 12:05:19.806691656 +0100 @@ -1,3 +1,4 @@ +#include "hda_intel_hack.c" /* @@ -15,7 +15,7 @@ #include <linux/time.h> #include <linux/completion.h> -@@ -428,8 +431,10 @@ +@@ -422,8 +425,10 @@ unsigned int wc_marked:1; unsigned int no_period_wakeup:1; @@ -26,7 +26,7 @@ int delay_negative_threshold; -@@ -696,6 +701,57 @@ +@@ -690,6 +695,57 @@ #define get_azx_dev(substream) (substream->runtime->private_data) #ifdef CONFIG_X86 @@ -84,7 +84,7 @@ static void __mark_pages_wc(struct azx *chip, struct snd_dma_buffer *dmab, bool on) { int pages; -@@ -1876,6 +1932,7 @@ +@@ -1870,6 +1926,7 @@ azx_dev->opened = 0; } @@ -92,7 +92,7 @@ static cycle_t azx_cc_read(const struct cyclecounter *cc) { struct azx_dev *azx_dev = container_of(cc, struct azx_dev, azx_cc); -@@ -1954,6 +2011,9 @@ +@@ -1948,6 +2005,9 @@ return 0; } @@ -102,7 +102,7 @@ static struct snd_pcm_hardware azx_pcm_hw = { .info = (SNDRV_PCM_INFO_MMAP | -@@ -2330,6 +2390,7 @@ +@@ -2324,6 +2384,7 @@ azx_readl(chip, OLD_SSYNC) & ~sbits); else azx_writel(chip, SSYNC, azx_readl(chip, SSYNC) & ~sbits); @@ -110,7 +110,7 @@ if (start) { azx_timecounter_init(substream, 0, 0); if (nsync > 1) { -@@ -2346,6 +2407,7 @@ +@@ -2340,6 +2401,7 @@ } } } @@ -118,7 +118,7 @@ spin_unlock(&chip->reg_lock); return 0; } -@@ -2582,7 +2644,11 @@ +@@ -2573,7 +2635,11 @@ struct azx_pcm *apcm = snd_pcm_substream_chip(substream); struct azx *chip = apcm->chip; if (!azx_snoop(chip)) @@ -130,7 +130,7 @@ return snd_pcm_lib_default_mmap(substream, area); } #else -@@ -3322,6 +3388,7 @@ +@@ -3311,6 +3377,7 @@ static bool check_hdmi_disabled(struct pci_dev *pci) { bool vga_inactive = false; @@ -138,7 +138,7 @@ struct pci_dev *p = get_bound_vga(pci); if (p) { -@@ -3329,6 +3396,7 @@ +@@ -3318,6 +3385,7 @@ vga_inactive = true; pci_dev_put(p); } @@ -146,7 +146,7 @@ return vga_inactive; } #endif /* SUPPORT_VGA_SWITCHEROO */ -@@ -3437,6 +3505,10 @@ +@@ -3424,6 +3492,10 @@ } } @@ -157,7 +157,7 @@ /* * white/black-list for enable_msi */ -@@ -3454,6 +3526,14 @@ +@@ -3441,6 +3513,14 @@ {} }; @@ -172,7 +172,7 @@ static void check_msi(struct azx *chip) { const struct snd_pci_quirk *q; -@@ -3462,7 +3542,11 @@ +@@ -3449,7 +3529,11 @@ chip->msi = !!enable_msi; return; } @@ -183,8 +183,8 @@ +#endif q = snd_pci_quirk_lookup(chip->pci, msi_black_list); if (q) { - printk(KERN_INFO -@@ -3471,6 +3555,16 @@ + dev_info(chip->card->dev, +@@ -3458,6 +3542,16 @@ chip->msi = q->value; return; } @@ -201,7 +201,7 @@ /* NVidia chipsets seem to cause troubles with MSI */ if (chip->driver_caps & AZX_DCAPS_NO_MSI) { -@@ -3492,7 +3586,7 @@ +@@ -3479,7 +3573,7 @@ if (snoop) { u8 val; pci_read_config_byte(chip->pci, 0x42, &val); @@ -210,7 +210,7 @@ snoop = false; } break; -@@ -3650,7 +3744,7 @@ +@@ -3636,7 +3730,7 @@ PCI_DEVICE_ID_ATI_SBX00_SMBUS, NULL); if (p_smbus) { diff --git a/alsa/pci/pdplus/pdplus.c b/alsa/pci/pdplus/pdplus.c index 11bd3f04d..1981c2a7a 100644 --- a/alsa/pci/pdplus/pdplus.c +++ b/alsa/pci/pdplus/pdplus.c @@ -342,7 +342,7 @@ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ -static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable switches */ +static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable switches */ EXPORT_NO_SYMBOLS; @@ -360,18 +360,18 @@ MODULE_PARM_DESC(id, "ID string for Prodif Plus soundcard."); module_param_array(enable, bool, NULL, 0444); MODULE_PARM_DESC(enable, "Enable Prodif Plus soundcard."); -static int silent_exit = 0; +static bool silent_exit; module_param(silent_exit, bool, 0444); MODULE_PARM_DESC(silent_exit, "Do not reset when driver is unloaded."); -static int init_adat = 0; +static bool init_adat; module_param(init_adat, bool, 0444); MODULE_PARM_DESC(init_adat, "Initialise the card in ADAT mode (instead of in digital stereo)."); #if DEBUG static int debug_level = 0; -module_param(debug_level, bool, 0444); +module_param(debug_level, int, 0444); MODULE_PARM_DESC(debug_level, "Debug level."); #endif /* ********************************************************************** */ @@ -6099,7 +6099,7 @@ static int __devinit pdplus_probe( LEAVE (-ENOENT); } - err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); + err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE, 0, &card); if (err < 0) LEAVE (err); diff --git a/alsa/usb/card.patch b/alsa/usb/card.patch index 7c10cae40..816739b27 100644 --- a/alsa/usb/card.patch +++ b/alsa/usb/card.patch @@ -1,11 +1,11 @@ ---- ../alsa-kernel/usb/card.c 2014-02-14 10:29:56.477068117 +0100 -+++ card.c 2014-02-14 10:39:06.138048150 +0100 +--- ../alsa-kernel/usb/card.c 2014-02-28 11:55:49.058259824 +0100 ++++ card.c 2014-02-28 12:02:57.056335503 +0100 @@ -1,3 +1,4 @@ +#include "card.inc" /* * (Tentative) USB Audio Driver for ALSA * -@@ -258,6 +259,7 @@ +@@ -261,6 +262,7 @@ } case UAC_VERSION_2: { @@ -13,18 +13,18 @@ struct usb_interface_assoc_descriptor *assoc = usb_ifnum_to_if(dev, ctrlif)->intf_assoc; -@@ -277,8 +279,10 @@ +@@ -280,8 +282,10 @@ } if (!assoc) { +#endif - snd_printk(KERN_ERR "Audio class v2 interfaces need an interface association\n"); + dev_err(&dev->dev, "Audio class v2 interfaces need an interface association\n"); return -EINVAL; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) } for (i = 0; i < assoc->bInterfaceCount; i++) { -@@ -289,6 +293,7 @@ +@@ -292,6 +296,7 @@ } break; @@ -32,7 +32,7 @@ } } -@@ -377,8 +382,13 @@ +@@ -380,8 +385,13 @@ chip->autoclock = autoclock; chip->probing = 1; @@ -46,7 +46,7 @@ INIT_LIST_HEAD(&chip->pcm_list); INIT_LIST_HEAD(&chip->ep_list); INIT_LIST_HEAD(&chip->midi_list); -@@ -481,8 +491,12 @@ +@@ -484,8 +494,12 @@ alts = &intf->altsetting[0]; ifnum = get_iface_desc(alts)->bInterfaceNumber; @@ -59,7 +59,7 @@ if (quirk && quirk->ifnum >= 0 && ifnum != quirk->ifnum) goto __err_val; -@@ -620,6 +634,7 @@ +@@ -623,6 +637,7 @@ } } @@ -67,7 +67,7 @@ /* * new 2.5 USB kernel API */ -@@ -740,6 +755,7 @@ +@@ -743,6 +758,7 @@ #define usb_audio_resume NULL #define usb_audio_reset_resume NULL #endif /* CONFIG_PM */ @@ -75,7 +75,7 @@ static struct usb_device_id usb_audio_ids [] = { #include "quirks-table.h" -@@ -755,14 +771,26 @@ +@@ -758,14 +774,26 @@ */ static struct usb_driver usb_audio_driver = { diff --git a/alsa/usb/quirks.patch b/alsa/usb/quirks.patch index 845275e0e..297bf45cd 100644 --- a/alsa/usb/quirks.patch +++ b/alsa/usb/quirks.patch @@ -1,5 +1,5 @@ ---- ../alsa-kernel/usb/quirks.c 2013-07-15 12:14:30.259860918 +0200 -+++ quirks.c 2013-08-06 10:53:33.113016271 +0200 +--- ../alsa-kernel/usb/quirks.c 2014-02-28 11:55:49.066259956 +0100 ++++ quirks.c 2014-02-28 12:01:31.817927726 +0100 @@ -1,3 +1,5 @@ +#define __NO_VERSION__ +#include "usbaudio.inc" @@ -43,24 +43,24 @@ + if (get_cfg_desc(config)->wTotalLength == EXTIGY_FIRMWARE_SIZE_OLD || + get_cfg_desc(config)->wTotalLength == EXTIGY_FIRMWARE_SIZE_NEW) { +#endif - snd_printdd("sending Extigy boot sequence...\n"); + dev_dbg(&dev->dev, "sending Extigy boot sequence...\n"); /* Send message to force it to reconnect with full interface. */ err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev,0), -@@ -566,8 +582,13 @@ - if (err < 0) snd_printdd("error usb_get_descriptor: %d\n", err); +@@ -569,8 +585,13 @@ err = usb_reset_configuration(dev); - if (err < 0) snd_printdd("error usb_reset_configuration: %d\n", err); + if (err < 0) + dev_dbg(&dev->dev, "error usb_reset_configuration: %d\n", err); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) - snd_printdd("extigy_boot: new boot length = %d\n", + dev_dbg(&dev->dev, "extigy_boot: new boot length = %d\n", le16_to_cpu(get_cfg_desc(config)->wTotalLength)); +#else -+ snd_printdd("extigy_boot: new boot length = %d\n", ++ dev_dbg(&dev->dev, "extigy_boot: new boot length = %d\n", + get_cfg_desc(config)->wTotalLength); +#endif return -ENODEV; /* quit this anyway */ } return 0; -@@ -575,6 +596,8 @@ +@@ -578,6 +599,8 @@ static int snd_usb_audigy2nx_boot_quirk(struct usb_device *dev) { @@ -69,7 +69,7 @@ u8 buf = 1; snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), 0x2a, -@@ -586,6 +609,7 @@ +@@ -589,6 +612,7 @@ 1, 2000, NULL, 0); return -ENODEV; } @@ -77,22 +77,22 @@ return 0; } -@@ -594,6 +618,10 @@ +@@ -597,6 +621,10 @@ int err; if (dev->actconfig->desc.bConfigurationValue == 1) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) -+ snd_printk(KERN_INFO "usb-audio: " ++ dev_info(&dev->dev, + "Fast Track Pro needs to switch to config #2; set by udev or hotplug rules by yourself\n"); +#else - snd_printk(KERN_INFO "usb-audio: " + dev_info(&dev->dev, "Fast Track Pro switching to config #2\n"); /* This function has to be available by the usb core module. -@@ -609,6 +637,7 @@ +@@ -613,6 +641,7 @@ that will just be destroyed and recreated with a new configuration */ return -ENODEV; +#endif } else - snd_printk(KERN_INFO "usb-audio: Fast Track Pro config OK\n"); + dev_info(&dev->dev, "Fast Track Pro config OK\n"); |