diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-22 14:47:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-22 14:47:43 -0700 |
| commit | 7ae9ed8d3221c9f7dd4bc2773ff58797487d5ed8 (patch) | |
| tree | fc9e9d8c0497767880d5fc9fe40f9bf454a522bd /include/linux/bcma/bcma.h | |
| parent | 0dfe178239453547d4297a4583ee7847948a481b (diff) | |
| parent | b38d355eaa223e420d0c45ff7a3279ea811552c5 (diff) | |
| download | op-kernel-dev-7ae9ed8d3221c9f7dd4bc2773ff58797487d5ed8.zip op-kernel-dev-7ae9ed8d3221c9f7dd4bc2773ff58797487d5ed8.tar.gz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'include/linux/bcma/bcma.h')
| -rw-r--r-- | include/linux/bcma/bcma.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h index 8c96654..5dbd705 100644 --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h @@ -6,6 +6,7 @@ #include <linux/bcma/bcma_driver_chipcommon.h> #include <linux/bcma/bcma_driver_pci.h> +#include <linux/bcma/bcma_driver_mips.h> #include <linux/ssb/ssb.h> /* SPROM sharing */ #include "bcma_regs.h" @@ -14,9 +15,9 @@ struct bcma_device; struct bcma_bus; enum bcma_hosttype { - BCMA_HOSTTYPE_NONE, BCMA_HOSTTYPE_PCI, BCMA_HOSTTYPE_SDIO, + BCMA_HOSTTYPE_SOC, }; struct bcma_chipinfo { @@ -130,6 +131,7 @@ struct bcma_device { struct device dev; struct device *dma_dev; + unsigned int irq; bool dev_registered; @@ -138,6 +140,9 @@ struct bcma_device { u32 addr; u32 wrap; + void __iomem *io_addr; + void __iomem *io_wrap; + void *drvdata; struct list_head list; }; @@ -190,9 +195,11 @@ struct bcma_bus { struct bcma_device *mapped_core; struct list_head cores; u8 nr_cores; + u8 init_done:1; struct bcma_drv_cc drv_cc; struct bcma_drv_pci drv_pci; + struct bcma_drv_mips drv_mips; /* We decided to share SPROM struct with SSB as long as we do not need * any hacks for BCMA. This simplifies drivers code. */ |
