Merge branch 'from-kernel' of git://git.kernel.org:/pub/scm/linux/kernel/git/dwmw2/linux-firmware

Conflicts:
WHENCE

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (74 commits)
  [SCSI] sg: fix q->queue_lock on scsi_error_handler path
  [SCSI] replace __inline with inline
  [SCSI] a2091: make 2 functions static
  [SCSI] a3000: make 2 functions static
  [SCSI] ses: #if 0 the unused ses_match_host()
  [SCSI] use kmem_cache_zalloc instead of kmem_cache_alloc/memset
  [SCSI] sg: fix iovec bugs introduced by the block layer conversion
  [SCSI] qlogicpti: use request_firmware
  [SCSI] advansys: use request_firmware
  [SCSI] qla1280: use request_firmware
  [SCSI] libiscsi: fix iscsi pool error path
  [SCSI] cxgb3i: call ddp release function directly
  [SCSI] cxgb3i: merge cxgb3i_ddp into cxgb3i module
  [SCSI] cxgb3i: close all tcp connections upon chip reset
  [SCSI] cxgb3i: re-read ddp settings information after chip reset
  [SCSI] cxgb3i: re-initialize ddp settings after chip reset
  [SCSI] cxgb3i: subscribe to error notification from cxgb3 driver
  [SCSI] aacraid driver update
  [SCSI] mptsas: remove unneeded check
  [SCSI] config: Make need for SCSI_CDROM clearer
  ...

Staging: sxg: slicoss: Specify the license for Sahara SXG and Slicoss drivers

Specify a license for the Alacritech Sahara (10Gbe) and SLICOSS (1GBE)
firmware files.

Signed-off-by: Christopher Harrer <charrer@alacritech.com>
Signed-off-by: Mithlesh Thukral <mithlesh@linsyssoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Staging: sxg: Add support to download the firmware using request_firmware()

Add support for downloading the firmware using kernel-builtin mechanism.
This will remove the need for the firmware files in the driver source code.

Signed-off-by: Christopher Harrer <charrer@alacritech.com>
Signed-off-by: Mithlesh Thukral <mithlesh@linsyssoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Staging: slicoss: add binary firmware to firmware directory

Adds the firmware to the firmware directory in ihex format so it can be
installed when doing make firmware_install.

Also update the firmware location in the driver code so it can locate
the files in the right place.

This should conclude the move to request_firmware().

Signed-off-by: Lior Dotan <liodot@gmail.com>
Cc: Christopher Harrer <charrer@alacritech.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-firmware

[SCSI] qlogicpti: use request_firmware

Firmware blob is little endian

Thanks to Stephen Rothwell for fixing typos

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

[SCSI] advansys: use request_firmware

Firmware blob looks like this...
        __le32 checksum
        unsigned char data[]

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

[SCSI] qla1280: use request_firmware

Firmware blob is little endian looks like this...
        unsigned char  Version1
        unsigned char  Version2
        unsigned char  Version3
        unsigned char  Padding
        unsigned short start_address
unsigned short data

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

Add firmwares for three Conexant chipsets for cx18, cx23885 and cx23840

Add firmwares for those V4L/DVB devices:
CX23418 PCI Broadcast A/V with MPEG encoder
CX25843 sideport Broadcast A/V decoder
CX23885 PCI Express Broadcast A/V decoder

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware

(Don't delete old cxgb3/t3fw-7.0.0.bin file)

smc91c92_cs: use request_firmware

Added osi_load_firmware() instead of copying same thing twice

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>

3C359: use request_firmware

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>

yam: use request_firmware

Added predef variable in add_mcs() to support predefined mcs data

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>

linux-firmware: Add firmware for Conexant cx231xx USB V4L/DVB driver

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

cxgb3: update FW

Update FW to 7.1

Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

typhoon: Use request_firmware()

Based on a patch by Jaswinder Singh <jaswinder@infradead.org>.

Compile-tested only.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

tehuti: Use request_firmware()

Firmware blob is little endian.

Compile-tested only.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

wimax/i2400m: add v1.4 of the i2400m firmware

This matches the 1.4.x release of the user space code done in
http://linuxwimax.org/Download.

The driver slated for 2.6.29 works with both 1.3 and 1.4 versions of
the firmware.

Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>

linux-firmware: Add Intel Wireless Wifi firmware

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

libertas: add libertas firmware for 88w8682 and 88w8688

Extracted from Linux driver tarballs downloaded from Marvell's
"Extranet" with permission.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Add various Marvell Libertas WiFi firmware

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: Manas Saksena <msaksena@marvell.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware

ti_usb_3410_5052: add Multi-Tech firmware

Add the Multi-Tech cellular modem firmware to the TI USB serial driver.
This firmware was extracted from:

ftp://ftp.multitech.com/wireless/wireless_linux.zip

Firmware licence: "all firmware components are redistributable in binary
form" per support@multitech.com
Copyright (C) 2005 Multi-Tech Systems, Inc.

Signed-off-by: Chris Adams <cmadams@hiwaay.net>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/linux-firmware-wimax

Conflicts:
WHENCE

Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

firmware: convert e100 driver to request_firmware()

Thanks to David Woodhouse for help.

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

make firmware/dsp56k/bootstrap.asm buildable on a56

Make firmware/dsp56k/bootstrap.asm buildable on a56, the free Motorola
DSP56001 assembler (http://www.zdomain.com/a56.html).

Summary of changes:

  - Remove '<' and '>' candy (they specify explicit addressing modes,
    which a56 don't grok, but uses implicitly anyway).

  - Replace 'move' with 'movem' when accessing program memory.

  - Rename a few labels to avoid duplicates (which a56 can't handle).

Signed-off-by: Robert Millan <rmh@aybabtu.com>
Cc: Jaswinder Singh <jaswinder@infradead.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

starfire: use request_firmware()

Firmware blob is big endian

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

firmware: convert tg3 driver to request_firmware()

Firmware blob looks like this...
        u8 firmware_major
        u8 firmware_minor
        u8 firmware_fix
        u8 pad
        __be32 start_address
        __be32 length (total, including BSS sections to be zeroed)
        data... (in __be32 words, which is native for the firmware)

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

firmware: convert acenic driver to request_firmware()

We store the firmware in its native big-endian form now, so the loop in
ace_copy() is modified to use be32_to_cpup() when writing it out.

We can forget the BSS,SBSS sections of the firmware, since we were
clearing all the device's RAM anyway. And the text,rodata,data sections
can all be loaded as a single chunk since they're contiguous (give or
take a few dozen bytes in between).

Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Acked-by: Jes Sorensen <jes@sgi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

cxgb3: integrate FW and protocol engines in the kernel

Include firmware and protocol images in the kernel image if requested

Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

i2400m: add firmware for Intel 2400m Wireless WiMAX Connection

Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>

Add the Atheros 11n ar9170 firmware.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

linux-firmware: Add orinoco Agere Hermes I firmware

Version 9.48 for WPA support with the orinoco driver

Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

cassini: use request_firmware

Firmware blob looks like this...
        __le16 load_address
        unsigned char data[]

[akpm@linux-foundation.org: include vmalloc.h]
Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Add QLogic qla2xxx firmware

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

firmware: convert sb16_csp driver to use firmware loader exclusively

Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

dsp56k: use request_firmware

Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

edgeport-ti: use request_firmware()

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()

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()

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()

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

cpia2: use request_firmware()

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()

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()

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()

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

ti_usb_3410_5052: use request_firmware()

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

emi62: use request_firmware()

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

emi26: use request_firmware()

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

keyspan_pda: use request_firmware()

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

keyspan: use request_firmware()

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

ttusb-budget: use request_firmware()

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>

kaweth: use request_firmware()

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

smctr: use request_firmware()

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

firmware: convert ymfpci driver to use firmware loader exclusively

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

firmware: convert maestro3 driver to use firmware loader exclusively

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

firmware: convert korg1212 driver to use firmware loader exclusively

Signed-off-by: David Woodhouse <dwmw2@infradead.org>