diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2017-01-13 12:23:35 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-01-17 14:23:44 +0200 |
| commit | 7195439d1d71bc4a6c33cfb57bc669a7cd041041 (patch) | |
| tree | 793ac65a1ec8a172e9af7b0538d2aaabeb8522e9 /drivers/bcma/driver_mips.c | |
| parent | 60f59ce0278557f7896d5158ae6d12a4855a72cc (diff) | |
| download | linux-7195439d1d71bc4a6c33cfb57bc669a7cd041041.tar.gz linux-7195439d1d71bc4a6c33cfb57bc669a7cd041041.tar.bz2 linux-7195439d1d71bc4a6c33cfb57bc669a7cd041041.zip | |
Revert "bcma: init serial console directly from ChipCommon code"
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>
Cc: stable@vger.kernel.org # 4.6+
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/bcma/driver_mips.c')
| -rw-r--r-- | drivers/bcma/driver_mips.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c index 96f171328200..89af807cf29c 100644 --- a/drivers/bcma/driver_mips.c +++ b/drivers/bcma/driver_mips.c @@ -278,9 +278,12 @@ static void bcma_core_mips_nvram_init(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_nvram_init(mcore); mcore->early_setup_done = true; |