2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 19:23:57 +08:00
linux-next/drivers/bcma
David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	Documentation/networking/ip-sysctl.txt
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-01-15 15:05:59 -05:00
..
bcma_private.h Drivers: bcma: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
core.c bcma: change delays to follow timers-howto guide 2012-09-28 13:54:02 -04:00
driver_chipcommon_nflash.c bcma: mark nflash if it is the boot flash 2012-10-19 15:52:37 -04:00
driver_chipcommon_pmu.c bgmac: driver for GBit MAC core on BCMA bus 2013-01-09 23:37:03 -08:00
driver_chipcommon_sflash.c bcma: correct M25P32 serial flash ID 2013-01-02 14:38:27 -05:00
driver_chipcommon.c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-12-14 14:27:45 -08:00
driver_gmac_cmn.c Drivers: bcma: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
driver_gpio.c bcma: add GPIO driver 2012-11-21 21:55:52 +01:00
driver_mips.c bcma: mips: fix clearing device IRQ 2012-12-10 15:49:53 -05:00
driver_pci_host.c Drivers: bcma: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
driver_pci.c Drivers: bcma: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
host_pci.c Drivers: bcma: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
host_soc.c bcma: make some functions static 2012-08-10 15:26:52 -04:00
Kconfig bcma: BCMA_DRIVER_GPIO should depend on GPIOLIB instead of selecting it 2013-01-02 14:38:22 -05:00
main.c Drivers: bcma: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
Makefile bcma: add GPIO driver 2012-11-21 21:55:52 +01:00
README bcma: add Broadcom specific AMBA bus driver 2011-05-10 15:54:54 -04:00
scan.c bcma: add missing iounmap on error path 2012-07-26 15:37:57 -04:00
scan.h bcma: fix typo - reading number of slave wrappers 2012-07-12 15:27:17 -04:00
sprom.c bcma: use fallback sprom if sprom on card was not valid 2012-10-19 15:52:53 -04:00
TODO bcma: add Broadcom specific AMBA bus driver 2011-05-10 15:54:54 -04:00

Broadcom introduced new bus as replacement for older SSB. It is based on AMBA,
however from programming point of view there is nothing AMBA specific we use.

Standard AMBA drivers are platform specific, have hardcoded addresses and use
AMBA standard fields like CID and PID.

In case of Broadcom's cards every device consists of:
1) Broadcom specific AMBA device. It is put on AMBA bus, but can not be treated
   as standard AMBA device. Reading it's CID or PID can cause machine lockup.
2) AMBA standard devices called ports or wrappers. They have CIDs (AMBA_CID)
   and PIDs (0x103BB369), but we do not use that info for anything. One of that
   devices is used for managing Broadcom specific core.

Addresses of AMBA devices are not hardcoded in driver and have to be read from
EPROM.

In this situation we decided to introduce separated bus. It can contain up to
16 devices identified by Broadcom specific fields: manufacturer, id, revision
and class.