bcma: init serial console directly from ChipCommon code

rmilecki · Kalle Valo · commit 4c81acab3816 · 2016-02-06T13:45:04.000+02:00
UART is connected to and controlled over ChipCommon core. It doesn't
have much to do with MIPS core (where we initialize it currently)
except just existing on embedded systemms. There isn't point of such
cross-core initialization (and we needed #ifdef anyway) so just handle
it in ChipCommon.

Signed-off-by: Rafał Miłecki &lt;zajec5@gmail.com&gt;
Signed-off-by: Kalle Valo &lt;kvalo@codeaurora.org&gt;
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
@@ -48,7 +48,6 @@ void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc);
 void bcma_core_chipcommon_init(struct bcma_drv_cc *cc);
 void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);
 #ifdef CONFIG_BCMA_DRIVER_MIPS
-void bcma_chipco_serial_init(struct bcma_drv_cc *cc);
 extern struct platform_device bcma_pflash_dev;
 #endif /* CONFIG_BCMA_DRIVER_MIPS */
 
diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c
@@ -15,6 +15,8 @@
 #include <linux/platform_device.h>
 #include <linux/bcma/bcma.h>
 
+static void bcma_chipco_serial_init(struct bcma_drv_cc *cc);
+
 static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset,
 					 u32 mask, u32 value)
 {
@@ -115,6 +117,8 @@ int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc)
 
 void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)
 {
+	struct bcma_bus *bus = cc->core->bus;
+
 	if (cc->early_setup_done)
 		return;
 
@@ -129,6 +133,9 @@ void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)
 	if (cc->capabilities & BCMA_CC_CAP_PMU)
 		bcma_pmu_early_init(cc);
 
+	if (IS_BUILTIN(CONFIG_BCM47XX) && bus->hosttype == BCMA_HOSTTYPE_SOC)
+		bcma_chipco_serial_init(cc);
+
 	cc->early_setup_done = true;
 }
 
@@ -314,9 +321,9 @@ u32 bcma_chipco_gpio_pulldown(struct bcma_drv_cc *cc, u32 mask, u32 value)
 	return res;
 }
 
-#ifdef CONFIG_BCMA_DRIVER_MIPS
-void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
+static void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
 {
+#if IS_BUILTIN(CONFIG_BCM47XX)
 	unsigned int irq;
 	u32 baud_base;
 	u32 i;
@@ -358,5 +365,5 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
 		ports[i].baud_base = baud_base;
 		ports[i].reg_shift = 0;
 	}
+#endif /* CONFIG_BCM47XX */
 }
-#endif /* CONFIG_BCMA_DRIVER_MIPS */
diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
@@ -337,12 +337,9 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)
 
 void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)
 {
-	struct bcma_bus *bus = mcore->core->bus;
-
 	if (mcore->early_setup_done)
 		return;
 
-	bcma_chipco_serial_init(&bus->drv_cc);
 	bcma_core_mips_flash_detect(mcore);
 
 	mcore->early_setup_done = true;

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`#include <linux/platform_device.h>`
`16`	`16`	`#include <linux/bcma/bcma.h>`
`17`	`17`
	`18`	`+static void bcma_chipco_serial_init(struct bcma_drv_cc *cc);`
	`19`	`+`
`18`	`20`	`static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset,`
`19`	`21`	`u32 mask, u32 value)`
`20`	`22`	`{`
`@@ -115,6 +117,8 @@ int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc)`
`115`	`117`
`116`	`118`	`void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)`
`117`	`119`	`{`
	`120`	`+ struct bcma_bus *bus = cc->core->bus;`
	`121`	`+`
`118`	`122`	`if (cc->early_setup_done)`
`119`	`123`	`return;`
`120`	`124`
`@@ -129,6 +133,9 @@ void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)`
`129`	`133`	`if (cc->capabilities & BCMA_CC_CAP_PMU)`
`130`	`134`	`bcma_pmu_early_init(cc);`
`131`	`135`
	`136`	`+ if (IS_BUILTIN(CONFIG_BCM47XX) && bus->hosttype == BCMA_HOSTTYPE_SOC)`
	`137`	`+ bcma_chipco_serial_init(cc);`
	`138`	`+`
`132`	`139`	`cc->early_setup_done = true;`
`133`	`140`	`}`
`134`	`141`
`@@ -314,9 +321,9 @@ u32 bcma_chipco_gpio_pulldown(struct bcma_drv_cc *cc, u32 mask, u32 value)`
`314`	`321`	`return res;`
`315`	`322`	`}`
`316`	`323`
`317`		`-#ifdef CONFIG_BCMA_DRIVER_MIPS`
`318`		`-void bcma_chipco_serial_init(struct bcma_drv_cc *cc)`
	`324`	`+static void bcma_chipco_serial_init(struct bcma_drv_cc *cc)`
`319`	`325`	`{`
	`326`	`+#if IS_BUILTIN(CONFIG_BCM47XX)`
`320`	`327`	`unsigned int irq;`
`321`	`328`	`u32 baud_base;`
`322`	`329`	`u32 i;`
`@@ -358,5 +365,5 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc)`
`358`	`365`	`ports[i].baud_base = baud_base;`
`359`	`366`	`ports[i].reg_shift = 0;`
`360`	`367`	`}`
	`368`	`+#endif /* CONFIG_BCM47XX */`
`361`	`369`	`}`
`362`		`-#endif /* CONFIG_BCMA_DRIVER_MIPS */`