litmus-rt.git/include/linux/ssb, branch wip-binary-heap

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: update reject bit for Target State Low

2011-04-26T19:50:29+00:00

My 14e4:4315 is SSB_IDLOW_SSBREV_26:
read32 0xfaafcff8 -> 0x600422d5
My 14e4:4328 is SSB_IDLOW_SSBREV_24:
read32 0xfaafcff8 -> 0x400422c5
My 14e4:432b is SSB_IDLOW_SSBREV_26 again:
read32 0xfaafcff8 -> 0x600422d5

For all of them wl driver is using 0x2 reject bit:
write32(0xf98) <- 0x00010002
So it seems SSB 2.3 is the exception using another bit.

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

ssb: cc: clear GPIOPULL registers on init

2011-04-25T18:50:20+00:00

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

ssb: cc: add & fix defines

2011-04-25T18:50:15+00:00

We probably got false positive results for checking PLL being down.

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: when needed, reject IM input while disabling device

2011-02-18T21:54:54+00:00

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

ssb: remove invalid define SSB_TMSLOW_PHYCLK

2011-02-18T21:54:53+00:00

It was incorrectly introduced in d2730b2a6a019d14455556019d744ab051e6554b. We
have already fixed function to use correct define, but forgot remove old one.

Signed-off-by: Rafał Miłecki 
Cc: Gábor Stefanik 
Signed-off-by: John W. Linville

ssb: extract boardflags2 for SPROMs rev 4 and 5

2011-02-09T21:09:51+00:00

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