mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
4b87f92259
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> |
||
|---|---|---|
| .. | ||
| bcma_private.h | ||
| core.c | ||
| driver_chipcommon_nflash.c | ||
| driver_chipcommon_pmu.c | ||
| driver_chipcommon_sflash.c | ||
| driver_chipcommon.c | ||
| driver_gmac_cmn.c | ||
| driver_gpio.c | ||
| driver_mips.c | ||
| driver_pci_host.c | ||
| driver_pci.c | ||
| host_pci.c | ||
| host_soc.c | ||
| Kconfig | ||
| main.c | ||
| Makefile | ||
| README | ||
| scan.c | ||
| scan.h | ||
| sprom.c | ||
| TODO | ||
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.