aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/bcma
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-07-22 19:20:10 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-08 14:29:28 -0400
commite3afe0e5be7576ac1282ea9fbbc9b352bb379227 (patch)
tree0b74e8bd5e45b2d50f9fa2033674a00aeac5f6ae /include/linux/bcma
parent21e0534ad7415559bb8dee0dc00e39646fed83c9 (diff)
bcma: add serial console support
This adds support for serial console to bcma, when operating on an SoC. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Acked-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux/bcma')
-rw-r--r--include/linux/bcma/bcma_driver_chipcommon.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h
index 03cde8d22e5f..b9a930eb44cd 100644
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -241,6 +241,9 @@
241#define BCMA_CC_SPROM 0x0800 /* SPROM beginning */ 241#define BCMA_CC_SPROM 0x0800 /* SPROM beginning */
242#define BCMA_CC_SPROM_PCIE6 0x0830 /* SPROM beginning on PCIe rev >= 6 */ 242#define BCMA_CC_SPROM_PCIE6 0x0830 /* SPROM beginning on PCIe rev >= 6 */
243 243
244/* ALP clock on pre-PMU chips */
245#define BCMA_CC_PMU_ALP_CLOCK 20000000
246
244/* Data for the PMU, if available. 247/* Data for the PMU, if available.
245 * Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU) 248 * Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU)
246 */ 249 */
@@ -255,6 +258,14 @@ struct bcma_pflash {
255 u32 window; 258 u32 window;
256 u32 window_size; 259 u32 window_size;
257}; 260};
261
262struct bcma_serial_port {
263 void *regs;
264 unsigned long clockspeed;
265 unsigned int irq;
266 unsigned int baud_base;
267 unsigned int reg_shift;
268};
258#endif /* CONFIG_BCMA_DRIVER_MIPS */ 269#endif /* CONFIG_BCMA_DRIVER_MIPS */
259 270
260struct bcma_drv_cc { 271struct bcma_drv_cc {
@@ -268,6 +279,9 @@ struct bcma_drv_cc {
268 struct bcma_chipcommon_pmu pmu; 279 struct bcma_chipcommon_pmu pmu;
269#ifdef CONFIG_BCMA_DRIVER_MIPS 280#ifdef CONFIG_BCMA_DRIVER_MIPS
270 struct bcma_pflash pflash; 281 struct bcma_pflash pflash;
282
283 int nr_serial_ports;
284 struct bcma_serial_port serial_ports[4];
271#endif /* CONFIG_BCMA_DRIVER_MIPS */ 285#endif /* CONFIG_BCMA_DRIVER_MIPS */
272}; 286};
273 287