summaryrefslogtreecommitdiffstats
path: root/drivers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6Linus Torvalds2008-07-15101-48761/+948
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-15101-48761/+948
| |\ | | | | | | | | | | | | | | | Conflicts: sound/pci/Kconfig
| | * dsp56k: use request_firmwareJaswinder Singh2008-07-141-51/+33
| | | | | | | | | | | | | | | 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-142-873/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-145-3557/+90
| | | | | | | | | | | | | | | | | | | | | 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-141-296/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-1427/+32
| | | | | | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| | * cpia2: use request_firmware()David Woodhouse2008-07-142-242/+37
| | | | | | | | | | | | | | | | | | 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-103-2163/+38
| | | | | | | | | | | | | | | | | | | | | 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-106-2170/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-102-1696/+50
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * ti_usb_3410_5052: use request_firmware()David Woodhouse2008-07-103-1783/+27
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * emi62: use request_firmware()David Woodhouse2008-07-103-17747/+73
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * emi26: use request_firmware()David Woodhouse2008-07-102-5809/+66
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * keyspan_pda: use request_firmware()David Woodhouse2008-07-105-2545/+24
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * keyspan: use request_firmware()David Woodhouse2008-07-1015-5078/+54
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * ttusb-budget: use request_firmware()David Woodhouse2008-07-102-1648/+12
| | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| | * kaweth: use request_firmware()David Woodhouse2008-07-102-574/+26
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * smctr: use request_firmware()David Woodhouse2008-07-103-1001/+35
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * firmware: Add CONFIG_FIRMWARE_IN_KERNEL option.David Woodhouse2008-07-101-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Fix a const pointer error in the Conexant cx23418 MPEG encoder driverDavid Howells2008-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix a const pointer to non-const pointer assignment error in the Conexant cx23418 MPEG encoder driver. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| | * Fix a const assignment in moxa_load_fw()David Howells2008-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | | Fix an assignment of a const pointer to a non-const pointer in moxa_load_fw(). Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| | * isight: treat firmware data as constgregkh@suse.de2008-07-101-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * dell_rbu: firmware data is constGreg Kroah-Hartman2008-07-101-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * tuners: treat firmware data as constDavid Woodhouse2008-07-102-2/+2
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * gp8psk: treat firmware data as constDavid Woodhouse2008-07-101-1/+2
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * cxusb: treat firmware data as constDavid Woodhouse2008-07-101-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | ...which means allocating our own copy when we want to modify it. (stupid thinko fixed by mkrufky) Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
| | * dvb frontends: treat firmware data as constDavid Woodhouse2008-07-107-9/+11
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * ttusb-dec: treat firmware data as constDavid Woodhouse2008-07-101-1/+1
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * bt8xx: treat firmware data as constDavid Woodhouse2008-07-101-1/+2
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * cxgb3: treat firmware data as constDavid Woodhouse2008-07-102-5/+7
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * irda-usb: treat firmware data as constDavid Woodhouse2008-07-101-6/+6
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * atmel: treat firmware data as constDavid Woodhouse2008-07-101-3/+3
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * p54: treat firmware data as constDavid Woodhouse2008-07-101-2/+3
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * rt2x00: treat firmware data as constDavid Woodhouse2008-07-104-8/+8
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * zd1201: treat firmware data as constDavid Woodhouse2008-07-101-1/+1
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * aic94xx: treat firmware data as constDavid Woodhouse2008-07-103-11/+12
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * cxacru: treat firmware data as constDavid Woodhouse2008-07-101-1/+1
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * ueagle-atm: treat firmware data as constDavid Woodhouse2008-07-101-9/+11
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * myri10ge: treat firmware data as constDavid Woodhouse2008-07-101-2/+9
| | | | | | | | | | | | | | | | | | ... which means allocating our own buffer for reading it back. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * cx25840: treat firmware data as constDavid Woodhouse2008-07-101-16/+11
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Hans Verkuil <hverkuil@xs4all.nl> Acked-by: Tyler Trafford <ttrafford@gmail.com> Acked-by: Mike Isely <isely@pobox.com>
| | * cyclades: treat firmware data as constDavid Woodhouse2008-07-101-5/+5
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * bluetooth: treat firmware data as constDavid Woodhouse2008-07-102-2/+4
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| | * libertas: treat firmware data as constDavid Woodhouse2008-07-103-5/+5
| | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
* | | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-07-1555-3288/+3560
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (241 commits) [ARM] 5171/1: ep93xx: fix compilation of modules using clocks [ARM] 5133/2: at91sam9g20 defconfig file [ARM] 5130/4: Support for the at91sam9g20 [ARM] 5160/1: IOP3XX: gpio/gpiolib support [ARM] at91: Fix NAND FLASH timings for at91sam9x evaluation kits. [ARM] 5084/1: zylonite: Register AC97 device [ARM] 5085/2: PXA: Move AC97 over to the new central device declaration model [ARM] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC drivers [ARM] 5147/1: pxaficp_ir: drop pxa_gpio_mode calls, as pin setting [ARM] 5145/1: PXA2xx: provide api to control IrDA pins state [ARM] 5144/1: pxaficp_ir: cleanup includes [ARM] pxa: remove pxa_set_cken() [ARM] pxa: allow clk aliases [ARM] Feroceon: don't disable BPU on boot [ARM] Orion: LED support for HP mv2120 [ARM] Orion: add RD88F5181L-FXO support [ARM] Orion: add RD88F5181L-GE support [ARM] Orion: add Netgear WNR854T support [ARM] s3c2410_defconfig: update for current build [ARM] Acer n30: Minor style and indentation fixes. ...
| * \ \ [ARM] Merge most of the PXA work for initial mergeRussell King2008-07-1519-258/+453
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes PXA work up to the SPI changes for the initial merge, since e172274ccc55d20536fbdceb6131f38e288541e0 depends on the SPI tree being merged. Conflicts: arch/arm/configs/em_x270_defconfig arch/arm/configs/xm_x270_defconfig
| | * | | [ARM] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC ↵Philipp Zabel2008-07-098-178/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers The pxa2xx_udc.c driver is renamed to pxa25x_udc.c (the platform driver name changes from pxa2xx-udc to pxa25x-udc) and the platform driver name of pxa27x_udc.c is fixed to pxa27x-udc. pxa_device_udc in devices.c is split into pxa25x and pxa27x flavors and the pxa27x_device_udc is enabled in pxa27x.c. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Nicolas Pitre <nico@cam.org> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Including from Ian Molton: Fixes for mistakes left over from the PXA2{5,7}X UDC split. Signed-off-by: Ian Molton <spyro@f2s.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 03:13:04 +0100