linux-toradex.git/include/linux/ssb/ssb.h, branch v3.0.79

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

2011-05-20T20:43:21+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.

SSB: Change fallback sprom to callback mechanism.

2011-05-19T08:55:47+00:00

Some embedded devices like the Netgear WNDR3300 have two SSB based cards
without an own sprom on the pci bus. We have to provide two different
fallback sproms for these and this was not possible with the old solution.
In the bcm47xx architecture the sprom data is stored in the nvram in the
main flash storage. The architecture code will be able to fill the sprom
with the stored data based on the bus where the device was found.

The bcm63xx code should do the same thing as before, just using the new
API.

Acked-by: Michael Buesch 
Cc: netdev@vger.kernel.org
Cc: linux-wireless@vger.kernel.org
Cc: Florian Fainelli 
Signed-off-by: Hauke Mehrtens 
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2362/
Signed-off-by: Ralf Baechle

ssb: move ssb_commit_settings and export it

2011-05-11T18:50:41+00:00

Commiting settings is possible on devices without PCI core (but with CC
core). Export it for usage in drivers supporting other cores.

Signed-off-by: Rafał Miłecki 
Signed-off-by: John W. Linville

ssb: trivial: use u8 for chip_rev (it's mask is 0xF)

2011-04-04T20:20:06+00:00

Signed-off-by: Rafał Miłecki 
Signed-off-by: John W. Linville

ssb: extract indexes for power tables

2010-12-02T19:37:00+00:00

Signed-off-by: Rafał Miłecki 
Acked-by: Michael Buesch 
Signed-off-by: John W. Linville

ssb: remove the ssb DMA API

2010-06-04T20:00:42+00:00

Now they are unnecessary.  We can use the generic DMA API with any bus.

Signed-off-by: FUJITA Tomonori 
Cc: Michael Buesch 
Cc: Gary Zambrano 
Cc: Stefano Brivio 
Cc: Larry Finger 
Cc: John W. Linville 
Cc: David S. Miller 
Signed-off-by: Andrew Morton 
Signed-off-by: John W. Linville

ssb: add dma_dev to ssb_device structure

2010-06-04T20:00:41+00:00

Add dma_dev, a pointer to struct device, to struct ssb_device.  We pass it
to the generic DMA API with SSB_BUSTYPE_PCI and SSB_BUSTYPE_SSB.
ssb_devices_register() sets up it properly.

This is preparation for replacing the ssb bus specific DMA API (ssb_dma_*)
with the generic DMA API.

Signed-off-by: FUJITA Tomonori 
Acked-by: Michael Buesch 
Cc: Gary Zambrano 
Cc: Stefano Brivio 
Cc: Larry Finger 
Cc: John W. Linville 
Acked-by: David S. Miller 
Signed-off-by: Andrew Morton 
Signed-off-by: John W. Linville

ssb: Look for SPROM at different offset on higher rev CC

2010-04-26T17:51:08+00:00

Our offset handling becomes even a little more hackish now. For some reason I
do not understand all offsets as inrelative. It assumes base offset is 0x1000
but it will work for now as we make offsets relative anyway by removing base
0x1000. Should be cleaner however.

Signed-off-by: Rafał Miłecki 
Signed-off-by: John W. Linville

ssb: do not read SPROM if it does not exist

2010-04-26T17:50:54+00:00

Attempting to read registers that don't exist on the SSB bus can cause
hangs on some boxes.  At least some b43 devices are 'in the wild' that
don't have SPROMs at all.  When the SSB bus support loads, it attempts
to read these (non-existant) SPROMs and causes hard hangs on the box --
no console output, etc.

This patch adds some intelligence to determine whether or not the SPROM
is present before attempting to read it.  This avoids those hard hangs
on those devices with no SPROM attached to their SSB bus.  The
SSB-attached devices (e.g. b43, et al.) won't work, but at least the box
will survive to test further patches. :-)

Signed-off-by: John W. Linville 
Signed-off-by: Rafał Miłecki 
Cc: Larry Finger 
Cc: Michael Buesch

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