diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-08-24 12:25:30 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-08-24 12:25:30 -0400 |
commit | f20b6213f193f455a62ef9299ceca11f5531dff8 (patch) | |
tree | 737a14af45038252fc0e3863d62dde09432cd779 /include/linux/bcma | |
parent | e6e94e392fddb8845bdd2e199f55ebf7d76cb58d (diff) | |
parent | a4881cc45a3fab4488e16c4934e149cfa620f1a9 (diff) | |
download | linux-stable-f20b6213f193f455a62ef9299ceca11f5531dff8.tar.gz linux-stable-f20b6213f193f455a62ef9299ceca11f5531dff8.tar.bz2 linux-stable-f20b6213f193f455a62ef9299ceca11f5531dff8.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'include/linux/bcma')
-rw-r--r-- | include/linux/bcma/bcma_driver_chipcommon.h | 26 | ||||
-rw-r--r-- | include/linux/bcma/bcma_regs.h | 2 |
2 files changed, 28 insertions, 0 deletions
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h index 3fb8bbafe5e7..6ba45d2b99db 100644 --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h @@ -515,6 +515,26 @@ struct bcma_pflash { u32 window_size; }; +#ifdef CONFIG_BCMA_SFLASH +struct bcma_sflash { + bool present; + u32 window; + u32 blocksize; + u16 numblocks; + u32 size; +}; +#endif + +#ifdef CONFIG_BCMA_NFLASH +struct mtd_info; + +struct bcma_nflash { + bool present; + + struct mtd_info *mtd; +}; +#endif + struct bcma_serial_port { void *regs; unsigned long clockspeed; @@ -535,6 +555,12 @@ struct bcma_drv_cc { struct bcma_chipcommon_pmu pmu; #ifdef CONFIG_BCMA_DRIVER_MIPS struct bcma_pflash pflash; +#ifdef CONFIG_BCMA_SFLASH + struct bcma_sflash sflash; +#endif +#ifdef CONFIG_BCMA_NFLASH + struct bcma_nflash nflash; +#endif int nr_serial_ports; struct bcma_serial_port serial_ports[4]; diff --git a/include/linux/bcma/bcma_regs.h b/include/linux/bcma/bcma_regs.h index a393e82bf7bf..6c9cb93ae3de 100644 --- a/include/linux/bcma/bcma_regs.h +++ b/include/linux/bcma/bcma_regs.h @@ -85,4 +85,6 @@ * (2 ZettaBytes), high 32 bits */ +#define BCMA_SFLASH 0x1c000000 + #endif /* LINUX_BCMA_REGS_H_ */ |