Add firmware for Modems based on Eagle Chipset

Signed-off-by: Hicham HAOUARI <hicham.haouari@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Add firmware for Intel Wireless WiFi Link 6250AGN Adapter

Version is 9.201.4.1

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

Fix Multitech MT9234MU and MT9234ZBA firmware

This shouldn't have been in .ihex form

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

firmware files for Multitech MT9234MU and MT9234ZBA modems

The following patch contains firmware for Multitech Systems' MT9234MU
and MT9234ZBA usb dialup fax modems. It has been provided to me by
Multitech Systems' support, and I converted the files to ihex format with
objcopy -I binary -O ihex <file.fw> <file.fw>.ihex

Signed-off-by: Alex Manoussakis <alex@juniper.net>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Update AR9271 firmware.

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

Fix 'Files' label on RTL8192E

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

Merge branch 'upstream' of http://git.decadent.org.uk/git/linux-firmware

Conflicts:
WHENCE

New Firmware for Atheros bluetooth chipset AR3011

Signed-off-by: Vikram Kandukuri <vikram.kandukuri@atheros.com>
Signed-off-by: Jothi Kumar <jkumar@atheros.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

radeon: add evergreen family microcode.

This is for the radeon HD5000 family of cards.

also update year in license file.

Signed-off-by: Dave Airlie <airlied@redhat.com>

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

Conflicts:
WHENCE

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

Conflicts:
WHENCE

Merge remote branch 'origin/master' into master

Conflicts:
WHENCE

Correct attribution and licence of Sierra Wireless CIS files

These files have nothing to do with the pcmcia-cs project; they are
distributed by Sierra Wireless under GPLv3.

Update copyright year for iwlwifi licence

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

Add Firmware for Atheros HTC devices

Chipset supported: AR9271

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

Add firmware for Intel 6000 Series Wi-Fi Adapters

Firmware for Intel 6000 Series Wi-Fi Adapters is version 9.193.4.1

Changelog:
- Sync with fixes from factory
- Fix CTKILL issue after resume
- Fix TC error resulting in NMI On 8KiB AMSDU frames required at
  least 4KiB free space
- Fix for 6000 series cards with EEPROM

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

radeon: add RLC firmwares from AMD.

License is redistributable but no RE or modification.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Additional firmwares for Sensoray s2255 webcam drivers

Sensoray sent me those two additional firmwares, under the same licence.

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

Firmware for Sensoray s2255 webcam drivers

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

Add firmware for lgs8g75

This is taken from the lgs8gxx driver as of 2.6.32-rc5.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Add RT3090 firmware from rt2860sta

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Update firmware from rt2870sta

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Specify drivers using firmware by module/object name

Drivers are currently specified by a mixture of module name, config
option or description, which is not that useful.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Use 'File:' field name in front of each filename

This will aid automatic parsing of this file.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Correct various filenames

Filenames should be the names of the installed binary files, without
the base directory 'firmware'.

Remove mention of absent file 'whiteheat_loader_debug.fw'.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Merge from fixed from-kernel tree to fix Matrox firmware binaries

Not entirely sure how these went wrong; will keep a closer eye on the
auto-conversion script. Thanks to Erik Inge Bolsø for spotting it.

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

Conflicts:
WHENCE

Firmware for Atheros bluetooth chipset AR3011

Signed-off-by: Tom Pham <tpham@atheros.com>
Signed-off-by: Vikram Kandukuri <vikram.kandukuri@atheros.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Add RealTek RTL8192E firmware

This comes directly from RealTek in their driver package provided
on their web site to be downloaded.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Standardi[sz]e spelling of 'Licence:' tag

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

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

Conflicts:
drivers/net/usb/cdc_ether.c

All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.

Signed-off-by: David S. Miller <davem@davemloft.net>

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

Conflicts:
drivers/net/usb/cdc_ether.c

All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.

Signed-off-by: David S. Miller <davem@davemloft.net>

pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card

pcnet_cs,serial_cs:

add cis of PreMax ethernet pcmcia card,
and some Sierra Wireless serial card(AC555, AC7xx, AC8xx).

use PROD_ID for AC7xx, because MANF_ID of AC7xx and AC8xx are the same.

Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card

pcnet_cs,serial_cs:

add cis of PreMax ethernet pcmcia card,
and some Sierra Wireless serial card(AC555, AC7xx, AC8xx).

use PROD_ID for AC7xx, because MANF_ID of AC7xx and AC8xx are the same.

Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

bnx2x: Allowing 0 as initial fairness value

Value of zero was used to disable the fairness mechanism. Though the code
(driver and FW) allowed changing the value at run time, it did not allow to do
that if the mechanism was disabled to begin with.
Fixed the FW to allow turning on and off the mechanism at run time. Fixed the
code to read the value from the chip at the right sequence.
Without this fix, if the initial value was set to zero, traffic could not run on
the interface.

Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

bnx2x: Allowing 0 as initial fairness value

Value of zero was used to disable the fairness mechanism. Though the code
(driver and FW) allowed changing the value at run time, it did not allow to do
that if the mechanism was disabled to begin with.
Fixed the FW to allow turning on and off the mechanism at run time. Fixed the
code to read the value from the chip at the right sequence.
Without this fix, if the initial value was set to zero, traffic could not run on
the interface.

Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Add legally redistributable firmware for the dib0700 USB bridge

Thanks to Patrick Boettcher <pboettcher@dibcom.fr> from DiBcom for
providing the firmware under a redistributable license.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

pcnet_cs: add cis of National Semicondoctor's multifunction pcmcia card

pcnet_cs,serial_cs:

add cis of National Semicondoctor's lan&modem mulitifunction pcmcia card,
NE2K, tamarack ethernet card,
and some serial card(COMpad2, COMpad4).

Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

pcnet_cs: add cis of National Semicondoctor's multifunction pcmcia card

pcnet_cs,serial_cs:

add cis of National Semicondoctor's lan&modem mulitifunction pcmcia card,
NE2K, tamarack ethernet card,
and some serial card(COMpad2, COMpad4).

Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (133 commits)
  drm/vgaarb: add VGA arbitration support to the drm and kms.
  drm/radeon: some r420s have a CP race with the DMA engine.
  drm/radeon/r600/kms: rv670 is not DCE3
  drm/radeon/kms: r420 idle after programming GA_ENHANCE
  drm/radeon/kms: more fixes to rv770 suspend/resume path.
  drm/radeon/kms: more alignment for rv770.c with r600.c
  drm/radeon/kms: rv770 blit init called too late.
  drm/radeon/kms: move around new init path code to avoid posting at init
  drm/radeon/r600: fix some issues with suspend/resume.
  drm/radeon/kms: disable VGA rendering engine before taking over VRAM
  drm/radeon/kms: Move radeon_get_clock_info() call out of radeon_clocks_init().
  drm/radeon/kms: add initial connector properties
  drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian.
  drm/radeon/kms: don't fail if we fail to init GPU acceleration
  drm/r600/kms: fixup number of loops per blit calculation.
  drm/radeon/kms: reprogram format in set base.
  drm/radeon: avivo chips have no separate int bit for display
  drm/radeon/r600: don't do interrupts
  drm: fix _DRM_GEM addmap error message
  drm: update crtc x/y when only fb changes
  ...

Fixed up trivial conflicts in firmware/Makefile due to network driver
(cxgb3) and drm (mga/r128/radeon) firmware being listed next to each
other.

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (133 commits)
  drm/vgaarb: add VGA arbitration support to the drm and kms.
  drm/radeon: some r420s have a CP race with the DMA engine.
  drm/radeon/r600/kms: rv670 is not DCE3
  drm/radeon/kms: r420 idle after programming GA_ENHANCE
  drm/radeon/kms: more fixes to rv770 suspend/resume path.
  drm/radeon/kms: more alignment for rv770.c with r600.c
  drm/radeon/kms: rv770 blit init called too late.
  drm/radeon/kms: move around new init path code to avoid posting at init
  drm/radeon/r600: fix some issues with suspend/resume.
  drm/radeon/kms: disable VGA rendering engine before taking over VRAM
  drm/radeon/kms: Move radeon_get_clock_info() call out of radeon_clocks_init().
  drm/radeon/kms: add initial connector properties
  drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian.
  drm/radeon/kms: don't fail if we fail to init GPU acceleration
  drm/r600/kms: fixup number of loops per blit calculation.
  drm/radeon/kms: reprogram format in set base.
  drm/radeon: avivo chips have no separate int bit for display
  drm/radeon/r600: don't do interrupts
  drm: fix _DRM_GEM addmap error message
  drm: update crtc x/y when only fb changes
  ...

Fixed up trivial conflicts in firmware/Makefile due to network driver
(cxgb3) and drm (mga/r128/radeon) firmware being listed next to each
other.

pcnet_cs: add cis of Linksys multifunction pcmcia card

pcnet_cs,serial_cs:

add cis of Linksys lan&modem mulitifunction pcmcia card
and some modem card(MT5634ZLX, RS-COM-2P).

Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

radeon: Use request_firmware()

Loosely based on a patch by
Jaswinder Singh Rajput <jaswinderlinux@gmail.com>.

KMS support by Dave Airlie <airlied@redhat.com>.

For Radeon 100- to 500-series, firmware blobs look like:
    struct {
        __be32 datah;
        __be32 datal;
    } cp_ucode[256];

For Radeon 600-series, there are two separate firmware blobs:
    __be32 me_ucode[PM4_UCODE_SIZE * 3];
    __be32 pfp_ucode[PFP_UCODE_SIZE];

For Radeon 700-series, likewise:
    __be32 me_ucode[R700_PM4_UCODE_SIZE];
    __be32 pfp_ucode[R700_PFP_UCODE_SIZE];

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>

radeon: Use request_firmware()

Loosely based on a patch by
Jaswinder Singh Rajput <jaswinderlinux@gmail.com>.

KMS support by Dave Airlie <airlied@redhat.com>.

For Radeon 100- to 500-series, firmware blobs look like:
    struct {
        __be32 datah;
        __be32 datal;
    } cp_ucode[256];

For Radeon 600-series, there are two separate firmware blobs:
    __be32 me_ucode[PM4_UCODE_SIZE * 3];
    __be32 pfp_ucode[PFP_UCODE_SIZE];

For Radeon 700-series, likewise:
    __be32 me_ucode[R700_PM4_UCODE_SIZE];
    __be32 pfp_ucode[R700_PFP_UCODE_SIZE];

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>

bnx2: Update firmware to 5.0.0.j3.

- Better small packet receive performance.
- Better handling of Flow control on 5709.
- Fixed iSCSI TMP ABORT TASK problem.
- Added iSCSI TCP timestamp option.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

drm/r128: Use request_firmware() to load CCE microcode

Firmware blob looks like this:
    __be32 datah
    __be32 datal

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>

drm/r128: Use request_firmware() to load CCE microcode

Firmware blob looks like this:
    __be32 datah
    __be32 datal

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>

drm/mga: Use request_firmware() to load microcode

Image format is IHEX, one record for each pipe in order (record
addresses are ignored).

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>

drm/mga: Use request_firmware() to load microcode

Image format is IHEX, one record for each pipe in order (record
addresses are ignored).

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>

convert ralink-firmware.txt UNIX line-endings

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

Move all licence files into top-level directory, unify spelling

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

linux-firmware: Add firmware for Intel WiFi Link 1000BGN

Firmware for Intel WiFi Link 1000BGN is v128.50.3.1

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

bnx2x: Using the new FW

The new FW improves the packets per second rate. It required a lot of change in
the FW which implies many changes in the driver to support it. It is now also
possible for the driver to use a separate MSI-X vector for Rx and Tx - this also
add some to the complicity of this change.

All things said - after this patch, practically all performance matrixes show
improvement.
Though Vladislav Zolotarov is not signed on this patch, he did most of the job
and deserves credit for that.

Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

linux-firmware: Update Intel Wireless WiFi 5100, 5300, 5350

Firmware for Intel Wireless WiFi 5100AGN, 5300AGN, and 5350AGN
is now version 8.24.2.12.

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

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

Conflicts:
WHENCE

linux-firmware: Update Intel Wireless Wifi 4965 firmware

Version is now 228.61.2.24

Signed-off-by: Reinette Chatre <reinette.chatre@intel.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

Conflicts:
WHENCE

cxgb3: use request_firmware() for the EDC registers setup

use request_firmware() to load the phy's EDC programmation

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

Add firmware for xc5000 tuner driver

Thanks to Devin Heitmueller <dheitmueller@kernellabs.com> for getting
Xceive permission for redistributing this firmware.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

cxgb3: Update FW to 7.4.0

Update FW to 7.4.
Bump up driver revision.

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

linux-firmware: Add Intel Wireless Wifi 5150 firmware

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

linux-firmware: Update Intel Wireless Wifi 3945 firmware

Version is now 15.32.2.9

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

3c589_cs: add cis(firmware) of 3Com multifunction pcmcia card

3c589_cs,3c574_cs,serial_cs:

 (1)add cis(firmware) of 3Com lan&modem mulitifunction pcmcia card.
 (2)load correct configuration register for 3Com card

Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

bnx2x: Separated FW from the source.

>From now on FW will be downloaded from the binary file using request_firmware.

There will be different files for every supported chip. Currently 57710 (e1) and
57711 (e1h).

File names have the following format: bnx2x-<chip version>-<FW version>.fw.
ihex versions of current FW files are submitted in the next patch.

Each binary file has a header in the following format:

struct bnx2x_fw_file_section {
__be32 len;
__be32 offset;
}

struct bnx2x_fw_file_hdr {
struct bnx2x_fw_file_section init_ops;
struct bnx2x_fw_file_section init_ops_offsets;
struct bnx2x_fw_file_section init_data;
struct bnx2x_fw_file_section tsem_int_table_data;
struct bnx2x_fw_file_section tsem_pram_data;
struct bnx2x_fw_file_section usem_int_table_data;
struct bnx2x_fw_file_section usem_pram_data;
struct bnx2x_fw_file_section csem_int_table_data;
struct bnx2x_fw_file_section csem_pram_data;
struct bnx2x_fw_file_section xsem_int_table_data;
struct bnx2x_fw_file_section xsem_pram_data;
struct bnx2x_fw_file_section fw_version;
}

Each bnx2x_fw_file_section contains the length and the offset of the appropriate
section in the binary file. Values are stored in the big endian format.

Data types of arrays:

init_data            __be32
init_ops_offsets     __be16
XXsem_pram_data         u8
XXsem_int_table_data    u8
init_ops             struct raw_op {
                          u8   op;
__be24 offset;
                        __be32 data;
     }
fw_version              u8

>From now boundaries of a specific initialization stage are stored in
init_ops_offsets array instead of being defined by separate macroes. The index
in init_ops_offsets is calculated by BLOCK_OPS_IDX macro:

#define BLOCK_OPS_IDX(block, stage, end) \
       (2*(((block)*STAGE_IDX_MAX) + (stage)) + (end))

Security:

In addition to sanity check of array boundaries bnx2x will check a FW version.
Additional checks might be added in the future.

Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Add Source: for usbdux firmware to WHENCE

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

Alacritech: reword firmware license to be distributable

by requesting the firmware to only be "used" on Alacritech products
the granted distribution right one paragraph above is negated.

Signed-off-by: Maximilian Attems <max@stro.at>
Signed-off-by: Christopher Harrer <charrer@alacritech.com>

Add the source code for the usbdux firmware

From: Bernd Porr <BerndPorr@f2s.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Add usbdux firmware

These are comedi drivers currently in the kernel staging directory.

From: Bernd Porr <BerndPorr@f2s.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

pcnet_cs: add cis(firmware) of the Allied Telesis LA-PCM

pcnet_cs: add cis(firmware) of the Allied Telesis LA-PCM

Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

Merge branch 'master' of http://git.decadent.org.uk/git/linux-firmware

Conflicts:
WHENCE

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

Conflicts:
WHENCE

linux-firmware: Add firmware for Ralink drivers

Add the firmware files for use with rt61pci, rt73usb, rt2860sta and
rt2870sta drivers.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Merge git://git.infradead.org/~dwmw2/firmware-2.6

* git://git.infradead.org/~dwmw2/firmware-2.6:
  qla1280: Fix off-by-some error in firmware loading.
  Add README.AddingFirmware file. Basically telling people not to.
  firmware: Remove newly-added slicoss and sxg firmware images
  firmware/WHENCE: Add missing origin information for Ambassador atmsar11.fw
  ALSA: wavefront - Always use request_firmware()
  Remove fdump tool for av7110 firmware
  firmware: convert av7110 driver to request_firmware()
  Partially revert "V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card"
  Revert "fix modules_install via NFS"

Add-add conflicts in firmware/WHENCE fixed manually

firmware: Remove newly-added slicoss and sxg firmware images

These are available elsewhere (for example in the linux-firmware.git
repository); they have no business being added to the kernel source
tree.

We are only putting stuff in the firmware/ directory of the kernel
source when it's extracted from long-standing drivers which used to
include it directly.

We didn't intend to open the floodgates to including megabytes of new
firmware which was previously being distributed separately.

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  b44: Use kernel DMA addresses for the kernel DMA API
  forcedeth: Fix resume from hibernation regression.
  xfrm: fix fragmentation on inter family tunnels
  ibm_newemac: Fix dangerous struct assumption
  gigaset: documentation update
  gigaset: in file ops, check for device disconnect before anything else
  bas_gigaset: use tasklet_hi_schedule for timing critical tasklets
  net/802/fddi.c: add MODULE_LICENSE
  smsc911x: remove unused #include <linux/version.h>
  axnet_cs: fix phy_id detection for bogus Asix chip.
  bnx2: Use request_firmware()
  b44: Fix sizes passed to b44_sync_dma_desc_for_{device,cpu}()
  socket: use percpu_add() while updating sockets_in_use
  virtio_net: Set the mac config only when VIRITO_NET_F_MAC
  myri_sbus: use request_firmware
  e1000: fix loss of multicast packets
  vxge: should include tcp.h

Conflict in firmware/WHENCE (SCSI vs net firmware)

firmware/WHENCE: Add missing origin information for Ambassador atmsar11.fw

Looks like we forgot to update WHENCE when we converted this driver.

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

ALSA: wavefront - Always use request_firmware()

Always use request_firmware() for loading yss225_registers image.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

firmware: convert av7110 driver to request_firmware()

Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
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

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
  ...

bnx2: Use request_firmware()

Based on original patch by Ben Hutchings <ben@decadent.org.uk> and
Bastian Blank <waldi@debian.org>, with the following main changes:

Separated the mips firmware and rv2p firmware into different files
to make it easier to update them separately.

Added some code to fixup the rv2p code with run-time information
such as PAGE_SIZE.

Update version to 2.0.0.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

myri_sbus: use request_firmware

Firmware blob looks like this...

        __be16 lanai4_data_size
        unsigned char lanai4_code[]

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

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>