linux.git/drivers/ssb, branch v2.6.33

ssb: Fix CONFIG_SSB_SDIOHOST typo

2010-02-03T21:55:20+00:00

This fixes a CONFIG_SSB_SDIOHOST typo.

Signed-off-by: Michael Buesch 
Reported-by: Christoph Egger 
Tested-By: Albert Herranz 
Signed-off-by: John W. Linville

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-12-05T23:22:26+00:00

Conflicts:
	drivers/net/pcmcia/fmvj18x_cs.c
	drivers/net/pcmcia/nmclan_cs.c
	drivers/net/pcmcia/xirc2ps_cs.c
	drivers/net/wireless/ray_cs.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2009-12-05T17:42:59+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (50 commits)
  pcmcia: rework the irq_req_t typedef
  pcmcia: remove deprecated handle_to_dev() macro
  pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer
  pcmcia: remove unused "window_t" typedef
  pcmcia: move some window-related code to pcmcia_ioctl.c
  pcmcia: Change window_handle_t logic to unsigned long
  pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()
  pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()
  pcmcia: Pass struct pcmcia_device to pcmcia_release_window()
  drivers/pcmcia: remove unnecessary kzalloc
  pcmcia: correct handling for Zoomed Video registers in topic.h
  pcmcia: fix printk formats
  pcmcia: autoload module pcmcia
  pcmcia/staging: update comedi drivers
  PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket
  PCMCIA: ss: allow PCI IRQs > 255
  PCMCIA: soc_common: remove 'dev' member from soc_pcmcia_socket
  PCMCIA: soc_common: constify soc_pcmcia_socket ops member
  PCMCIA: sa1111: remove duplicated initializers
  PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data
  ...

ssb: Fix range check in sprom write

2009-11-23T22:05:41+00:00

The range check in the sprom image parser hex2sprom() is broken.
One sprom word is 4 hex characters.
This fixes the check and also adds much better sanity checks to the code.
We better make sure the image is OK by doing some sanity checks to avoid
bricking the device by accident.

Signed-off-by: Michael Buesch 
Cc: stable@kernel.org
Signed-off-by: John W. Linville

ssb: Fix SPROM writing

2009-11-23T22:05:41+00:00

The SPROM writing routines were broken since we rewrote the suspend
handling on wireless devices, because SPROM writing depended on suspend.

This patch changes it and freezes devices with the driver remove(), probe()
callbacks instead. This also simplifies the whole logics a lot.

Signed-off-by: Michael Buesch 
Signed-off-by: John W. Linville

ssb: Unconditionally log results of core scans

2009-11-23T22:05:28+00:00

At present, the results of an SSB core scan are only logged when
CONFIG_SSB_DEBUG is "y". As this may not be set in a distro kernel,
it is difficult interpret many problems posted in bug reports or in
help forums.

Signed-off-by: Larry Finger 
Signed-off-by: John W. Linville

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

2009-11-11T19:38:16+00:00

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-1000.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-core.h

ssb-pcmcia: Fix 32bit register access in early bus scanning

2009-11-10T21:21:12+00:00

The scan function was using 32 bit access which does not
work on 16bit CF cards.

This patch corrects this by doing two 16 bit reads like
ssb_pcmcia_read32 already does.

mb -- Removed locking. That early in init there's no need for locking.

Signed-off-by: Martin Fuzzey 
Signed-off-by: Michael Buesch 
Signed-off-by: John W. Linville

pcmcia: convert ssb pcmcia driver to use new CIS helpers

2009-11-08T17:23:09+00:00

SSB is a prime example of how to make use of the new CIS helpers.

CC: Michael Buesch 
Acked-by: John W. Linville 
Signed-off-by: Dominik Brodowski

ssb: Put host pointers into a union

2009-10-27T20:47:55+00:00

This slightly shrinks the structure.

Signed-off-by: Michael Buesch 
Signed-off-by: John W. Linville