* [PATCH 1/2] bcm63xx: fix soft-reset lockup on BCM6345
@ 2009-08-31 18:27 Florian Fainelli
0 siblings, 0 replies; only message in thread
From: Florian Fainelli @ 2009-08-31 18:27 UTC (permalink / raw)
To: ralf Baechle, Maxime Bizon; +Cc: linux-mips
This patch fixes a lockup on BCM6345 where setting the
PLL soft reset bit will also lock the other blocks including UART.
Instead of setting only the PLL soft reset bit in the
software reset register, set this bit but do not touch
the others.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c
index b18a0ca..d005659 100644
--- a/arch/mips/bcm63xx/setup.c
+++ b/arch/mips/bcm63xx/setup.c
@@ -75,7 +75,9 @@ void bcm63xx_machine_reboot(void)
bcm6348_a1_reboot();
printk(KERN_INFO "triggering watchdog soft-reset...\n");
- bcm_perf_writel(SYS_PLL_SOFT_RESET, PERF_SYS_PLL_CTL_REG);
+ reg = bcm_perf_readl(PERF_SYS_PLL_CTL_REG);
+ reg |= SYS_PLL_SOFT_RESET;
+ bcm_perf_writel(reg, PERF_SYS_PLL_CTL_REG);
while (1)
;
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-08-31 18:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-31 18:27 [PATCH 1/2] bcm63xx: fix soft-reset lockup on BCM6345 Florian Fainelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).