diff options
| author |   Florian Fainelli <florian@openwrt.org> | 2009-08-31 20:27:39 +0200 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2009-11-02 12:00:03 +0100 |
| commit | e85d59df13cf5cce08becb3fd261048e6d870c0d (patch) | |
| tree | 2ba33e2a51774f0684ba54d41cac066693f67041 /arch | |
| parent | MIPS: TXx9: Fix error handling / Fix for noenexisting gpio_remove. (diff) | |
| download | linux-dev-e85d59df13cf5cce08becb3fd261048e6d870c0d.tar.xz linux-dev-e85d59df13cf5cce08becb3fd261048e6d870c0d.zip | |
MIPS: BCM63xx: Fix soft-reset lockup on BCM6345
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>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/bcm63xx/setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c index b18a0ca926fa..d0056598fbfc 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) ; } |