summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ALSA: Allow to force model to intel-mac-v3 in snd_hda_intel (sigmatel).Nicolas Boichat2008-07-272-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, even if you pass model=intel-mac-v3 as a module parameter to snd_hda_intel, the function patch_stac922x (patch_sigmatel.c) will still try to auto-detect the model type. This is a problem on my MacBook Pro 1st generation, which needs intel-mac-v3, but sometimes incorrectly reports 0x00000100 as subsystem id, which causes the switch in patch_stac922x to select intel-mac-v4. To fix this, I added a new model called intel-mac-auto, so in case no module parameter is passed, and an Intel Mac board is detected, the model will be automatically detected, while no detection will be done if the model is forced to intel-mac-v3. This problem has been around for quite a while, and I used to fix it by moving the case statement for 0x00000100 in patch_stac922x so that intel-mac-v3 is chosen. Another way to fix the problem would be to check if a module parameter was set directly in patch_stac922x, using something like this: if (spec->board_config == STAC_INTEL_MAC_V3 && !codec->bus->modelname) { But I think it is less elegant (if you prefer that way, I can prepare a patch). Signed-off-by: Nicolas Boichat <nicolas@boichat.ch> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: cs4232: fix crash during chip PNP detectionKrzysztof Helt2008-07-271-0/+1
| | | | | | | | | The acard->wss pointer is uninitialized in this function which leads to crash during chip PNP detection. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Acked-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: hda - Add automatic model setting for the Acer Aspire 5920G laptopTravis Place2008-07-271-0/+1
| | | | | | | | Make the Acer Aspire 5920G (1025:0121) select ALC883_ACER_ASPIRE by default. Signed-off-by: Travis Place <wishie@wishie.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: make snd_ac97_add_vmaster() staticAdrian Bunk2008-07-271-2/+2
| | | | | | | This patch makes the needlessly global snd_ac97_add_vmaster() static. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: sound/pci/azt3328.h: no variables for enumsAdrian Bunk2008-07-271-2/+2
| | | | | | | | | AZF_FREQUENCIES and AZF_GAME_CONFIGS were variables, and this doesn't seem to have been intended. Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Andreas Mohr <andi@lisas.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: soc - wm9712 mono mixerMarek Vasut2008-07-201-5/+5
| | | | | | | | | | | this fixes typo in wm9712 codec which prevents it from registering all audio routes (and thus working correctly). Please consider applying. (Tested and works on palmtx, palmld and palmt5) Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Mark Brown <brooie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: hda - Add support of ASUS Eeepc P90*Kailang Yang2008-07-181-7/+172
| | | | | | | | - Support ASUS_P900A = P703 - Support ASUS_P901 Signed-off-by: Kailang Yang <kailang@realtek.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: opti9xx: no isapnp param for !CONFIG_PNPRene Herman2008-07-181-0/+4
| | | | | | | "isapnp" needs CONFIG_PNP to be useful. Signed-off-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: opti93x - Fix NULL dereferenceTakashi Iwai2008-07-181-1/+1
| | | | | | | | | | | Probing non-existing device causes Oops with snd-opti93x driver due to NULL access in the destructor of the error path. Signed-off-by: Takashi Iwai <tiwai@suse.de> Tested-by: Rene Herman <rene.herman@gmail.com> Acked-by: Rene Herman <rene.herman@gmail.com> Tested-by: Ingo Molnar <mingo@elte.hu> Acked-by: Ingo Molnar <mingo@elte.hu>
* ALSA: hda - Added support for Asus V1SnAlexander Holler2008-07-171-0/+1
| | | | | | | Added the necessary ID for Asus V1Sn to patch_realtek.c to use ALC861VD_LENOVO on these laptops. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: ASoC: Factor PGA DAPM handling into mainMark Brown2008-07-171-18/+8
| | | | | | | This allows pre and post event hooks to be provided for PGA widgets. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: ASoC: Refactor DAPM event handlerMark Brown2008-07-171-38/+41
| | | | | | | | | The DAPM event callback code has many layers of indentation, taking it over 80 columns. Refactor the code to give less indentation in order to avoid checkpatch issues on further changes and exploding indentation. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: ALSA: ens1370: communicate PCI device to AC97Rene Herman2008-07-171-0/+1
| | | | | | | | communicate the ES137x PCI device to the AC97 code for its subsys_vendor/device values Signed-off-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: ens1370: SRC stands for Sample Rate ConverterRene Herman2008-07-171-1/+1
| | | | | Signed-off-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: hda - Align BDL position adjustment parameterTakashi Iwai2008-07-161-1/+5
| | | | | | | | It seems NVidia and other hardwares require the alignment for period update timing. For satisfying this condition, align the position adjustment for delayed wake-up to the initial bdl_pos_adj value. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: Au1xpsc: psc not disabled when TX is idleRoel Kluin2008-07-151-1/+1
| | | | | | | | TX idleness isn't tested, but RX twice. PSC is not disabled when TX is idle Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: Manuel Lauss <mano@roarinelk.homelinux.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: add TriTech 28023 AC97 codec ID and Wolfson 9701 name.Rene Herman2008-07-151-1/+2
| | | | | Signed-off-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* firmware: Correct dependency on CONFIG_EXTRA_FIRMWARE_DIRDavid Woodhouse2008-07-141-1/+1
| | | | | | | | | | | When CONFIG_EXTRA_FIRMWARE_DIR gets changed, the filename in the .S file (which uses .incbin to include the binary) needs to change. When we renamed the BUILTIN_FIRMWARE_DIR option to EXTRA_FIRMWARE_DIR, we forgot to update the manual dependency in firmware/Makefile, so it was depending on a non-existent file in include/config/ Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6Linus Torvalds2008-07-14181-50283/+29649
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits) firmware: convert sb16_csp driver to use firmware loader exclusively dsp56k: use request_firmware edgeport-ti: use request_firmware() edgeport: use request_firmware() vicam: use request_firmware() dabusb: use request_firmware() cpia2: use request_firmware() ip2: use request_firmware() firmware: convert Ambassador ATM driver to request_firmware() whiteheat: use request_firmware() ti_usb_3410_5052: use request_firmware() emi62: use request_firmware() emi26: use request_firmware() keyspan_pda: use request_firmware() keyspan: use request_firmware() ttusb-budget: use request_firmware() kaweth: use request_firmware() smctr: use request_firmware() firmware: convert ymfpci driver to use firmware loader exclusively firmware: convert maestro3 driver to use firmware loader exclusively ... Fix up trivial conflicts with BKL removal in drivers/char/dsp56k.c and drivers/char/ip2/ip2main.c manually.
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gitDavid Woodhouse2008-07-14181-50283/+29649
| |\ | | | | | | | | | | | | | | | Conflicts: sound/pci/Kconfig
| | * firmware: convert sb16_csp driver to use firmware loader exclusivelyJaswinder Singh2008-07-1410-980/+506
| | | | | | | | | | | | | | | Signed-off-by: Jaswinder Singh <jaswinder@infradead.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| | * dsp56k: use request_firmwareJaswinder Singh2008-07-145-51/+170
| | | | | | | | | | | | | | | Signed-off-by: Jaswinder Singh <jaswinder@infradead.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| | * edgeport-ti: use request_firmware()Jaswinder Singh2008-07-145-873/+879
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firmware blob looks like this... uint8_t MajorVersion uint8_t MinorVersion __le16 BuildNumber uint8_t data[] Signed-off-by: Jaswinder Singh <jaswinder@infradead.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| | * edgeport: use request_firmware()Jaswinder Singh2008-07-1411-3557/+225
| | | | | | | | | | | | | | | | | | | | | Version number provided in first HEX record. Signed-off-by: Jaswinder Singh <jaswinder@infradead.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| | * vicam: use request_firmware()Jaswinder Singh2008-07-144-296/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although it wasn't actually using ihex records before, we use the Intel HEX record format for this firmware -- because that gives us a simple way to split it into separate chunks internally as we need, without loading each part as a separate file. Signed-off-by: Jaswinder Singh <jaswinder@infradead.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| | * dabusb: use request_firmware()David Woodhouse2008-07-146-1427/+1461
| | | | | | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| | * cpia2: use request_firmware()David Woodhouse2008-07-145-242/+124
| | | | | | | | | | | | | | | | | | Thanks for Jaswinder Singh for converting the firmware blob itself to ihex. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| | * ip2: use request_firmware()David Woodhouse2008-07-106-2163/+2196
| | | | | | | | | | | | | | | | | | | | | Converted with help from Jaswinder Singh Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Alan Cox <alan@redhat.com>
| | * firmware: convert Ambassador ATM driver to request_firmware()David Woodhouse2008-07-108-2170/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since it had various regions to be loaded to separate addresses, and it wanted to do them in fairly small chunks anyway, switch it to use the new ihex code. Encode the start address in the first record. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Chas Williams <chas@cmf.nrl.navy.mil>
| | * whiteheat: use request_firmware()David Woodhouse2008-07-107-1696/+1887
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * ti_usb_3410_5052: use request_firmware()David Woodhouse2008-07-107-1783/+1767
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * emi62: use request_firmware()David Woodhouse2008-07-109-17747/+7100
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * emi26: use request_firmware()David Woodhouse2008-07-107-5809/+5870
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * keyspan_pda: use request_firmware()David Woodhouse2008-07-109-229/+210
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * keyspan: use request_firmware()David Woodhouse2008-07-1029-5078/+1712
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * ttusb-budget: use request_firmware()David Woodhouse2008-07-105-1648/+843
| | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * kaweth: use request_firmware()David Woodhouse2008-07-108-574/+304
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * smctr: use request_firmware()David Woodhouse2008-07-106-1001/+526
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * firmware: convert ymfpci driver to use firmware loader exclusivelyDavid Woodhouse2008-07-108-1638/+1562
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * firmware: convert maestro3 driver to use firmware loader exclusivelyDavid Woodhouse2008-07-106-181/+187
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * firmware: convert korg1212 driver to use firmware loader exclusivelyDavid Woodhouse2008-07-106-1015/+1007
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * ihex: Add support for long records to ihex2fw.cDavid Woodhouse2008-07-102-19/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some drivers could do with using records like Intel HEX, but with each record being larger than 256 bytes. This has been possible in the binary representation (struct ihex_binrec) in the kernel since the beginning -- at least of the the current version of history. But we haven't been able to represent that in the .HEX files which get converted to .fw files. This adds a '-w' option to ihex2fw to make it interpret the first _two_ bytes of each line as the record length, instead of only one byte. And adds makefile rules for %.H16->%.fw which use that. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * ihex: add ihex2fw tool for converting HEX files into firmware imagesDavid Woodhouse2008-07-103-1/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not the straight conversion to binary which objcopy can do for us, but actually representing each record with its original {addr, length}, because some drivers need that information preserved. Fix up 'firmware_install' to be able to build $(hostprogs-y) too. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * ihex: request_ihex_firmware() function to load and validate firmwareDavid Woodhouse2008-07-101-0/+24
| | | | | | | | | | | | | | | | | | | | | Provide a helper to load the file and validate it in one call, to simplify error handling in the drivers which are going to use it. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * ihex.h: binary representation of ihex recordsDavid Woodhouse2008-07-101-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some devices need their firmware as a set of {address, len, data...} records in some specific order rather than a simple blob. The normal way of doing this kind of thing is 'ihex', which is a text format and not entirely suitable for use in the kernel. This provides a binary representation which is very similar, but much more compact -- and a helper routine to skip to the next record, because the alignment constraints mean that everybody will screw it up for themselves otherwise. Also a helper function which can verify that a 'struct firmware' contains a valid set of ihex records, and that following them won't run off the end of the loaded data. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * firmware: Add firmware installation to modules_install, add firmware_installDavid Woodhouse2008-07-103-7/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For 'make modules_install', install any firmware required by the modules which are being installed. Also add a 'make firmware_install' target which doesn't depend on the configuration, but installs _all_ available in-kernel-tree firmware into $(INSTALL_FW_PATH), which defaults to /lib/firmware. This is intended for distributors to make arch-independent (and config-independent) packages containing firmware. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| | * firmware: Add CONFIG_FIRMWARE_IN_KERNEL option.David Woodhouse2008-07-102-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will control whether we build firmware into the kernel image for _every_ driver which we convert to request_firmware(), to avoid a proliferation of 'CONFIG_XXX_FIRMWARE' options for each one. Default to 'y' for now, which is the wrong thing to do but people seem to be insisting on it and refusing to even review patches until it's done. And it does preserve the existing behaviour for built-in drivers. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * firmware: Add CONFIG_EXTRA_FIRMWARE optionDavid Woodhouse2008-07-103-1/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows arbitrary firmware files to be included in the static kernel where the firmware loader can find them without requiring userspace to be alive. (Updated and CONFIG_EXTRA_FIRMWARE_DIR added with lots of help from Johannes Berg). Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
| | * firmware: allow firmware files to be built into kernel imageDavid Woodhouse2008-07-103-2/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some drivers have their own hacks to bypass the kernel's firmware loader and build their firmware into the kernel; this renders those unnecessary. Other drivers don't use the firmware loader at all, because they always want the firmware to be available. This allows them to start using the firmware loader. A third set of drivers already use the firmware loader, but can't be used without help from userspace, which sometimes requires an initrd. This allows them to work in a static kernel. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * firmware: make fw->data constDavid Woodhouse2008-07-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for supporting firmware files linked into the static kernel, make fw->data const to ensure that users aren't modifying it (so that we can pass a pointer to the original in-kernel copy, rather than having to copy it). Signed-off-by: David Woodhouse <dwmw2@infradead.org>