diff options
| author |   Lennert Buytenhek <buytenh@wantstofly.org> | 2005-11-01 19:44:25 +0000 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-01 19:44:25 +0000 |
| commit | 69a857610ad212ce4bcd8e6b13f25408691403de (patch) | |
| tree | 52f7eb9eeb3dbf7e82b8b86b30d6056ee5109c7e /include | |
| parent | [ARM] 3062/1: map in various enp2611 peripherals for the ixp2000 netdev driver (diff) | |
| download | linux-dev-69a857610ad212ce4bcd8e6b13f25408691403de.tar.xz linux-dev-69a857610ad212ce4bcd8e6b13f25408691403de.zip | |
[ARM] 3063/1: allow slave ixp2000 cpu reset
Patch from Lennert Buytenhek
On the ixdp2x00, the slave CPU is currently not allowed to reset itself
for fear that it will do something 'funky' on the PCI bus. This fear is
ungrounded -- the slave CPU is wired up such that a CPU reset will not
cause a PCI bus reset to be done. This patch changes arch_reset() so
that the slave CPU also executes the reset sequence, allowing it to
reboot itself using /sbin/reboot.
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-ixp2000/system.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/asm-arm/arch-ixp2000/system.h b/include/asm-arm/arch-ixp2000/system.h index 4f489cc0dfa5..d9d6d9d07e02 100644 --- a/include/asm-arm/arch-ixp2000/system.h +++ b/include/asm-arm/arch-ixp2000/system.h @@ -44,11 +44,5 @@ static inline void arch_reset(char mode) *IXDP2X01_CPLD_RESET_REG = 0x80000000; } - /* - * We do a reset all if we are PCI master. We could be a slave and we - * don't want to do anything funky on the PCI bus. - */ - if (*IXP2000_STRAP_OPTIONS & CFG_PCI_BOOT_HOST) { - *(IXP2000_RESET0) |= (RSTALL); - } + *IXP2000_RESET0 = RSTALL; } |