summaryrefslogtreecommitdiff
path: root/drivers/bcma/bcma_private.h
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-01-13 12:23:35 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-09 08:08:28 +0100
commit16f61dee7e7cb378216ff59ffeacf157efad6c82 (patch)
treeded1610ffd1b1995f9747d95bd78569274121014 /drivers/bcma/bcma_private.h
parent12f822d23deee45421bf65dc9f5ff0fdcc783701 (diff)
downloadlinux-rt-16f61dee7e7cb378216ff59ffeacf157efad6c82.tar.gz
Revert "bcma: init serial console directly from ChipCommon code"
commit 7195439d1d71bc4a6c33cfb57bc669a7cd041041 upstream. This reverts commit 4c81acab3816 ("bcma: init serial console directly from ChipCommon code") as it broke IRQ assignment. Getting IRQ with bcma_core_irq helper on SoC requires MIPS core to be set. It happens *after* ChipCommon initialization so we can't do this so early. This fixes a user reported regression. It wasn't critical as serial was still somehow working but lack of IRQs was making in unreliable. Fixes: 4c81acab3816 ("bcma: init serial console directly from ChipCommon code") Reported-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/bcma/bcma_private.h')
-rw-r--r--drivers/bcma/bcma_private.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
index f642c4264c27..168fa175d65a 100644
--- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h
@@ -45,6 +45,9 @@ int bcma_sprom_get(struct bcma_bus *bus);
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);
+#endif /* CONFIG_BCMA_DRIVER_MIPS */
/* driver_chipcommon_b.c */
int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb);