diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2012-08-10 21:23:53 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-08-21 16:05:52 -0400 |
commit | d57ef3a6a2eeb88df47e892c66692e3f59722ffe (patch) | |
tree | db2f260a55ce24cfed110cb6281674a5fbcb0a86 /include/linux/bcma | |
parent | 01e17dacd47101ad7d33152bbfbbd4394352d2e6 (diff) | |
download | linux-stable-d57ef3a6a2eeb88df47e892c66692e3f59722ffe.tar.gz linux-stable-d57ef3a6a2eeb88df47e892c66692e3f59722ffe.tar.bz2 linux-stable-d57ef3a6a2eeb88df47e892c66692e3f59722ffe.zip |
bcma: detect and register serial flash device
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux/bcma')
-rw-r--r-- | include/linux/bcma/bcma_driver_chipcommon.h | 13 | ||||
-rw-r--r-- | include/linux/bcma/bcma_regs.h | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h index fcb06fb284eb..bed89694c5f9 100644 --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h @@ -509,6 +509,16 @@ struct bcma_pflash { u32 window_size; }; +#ifdef CONFIG_BCMA_SFLASH +struct bcma_sflash { + bool present; + u32 window; + u32 blocksize; + u16 numblocks; + u32 size; +}; +#endif + struct bcma_serial_port { void *regs; unsigned long clockspeed; @@ -529,6 +539,9 @@ 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 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_ */ |