From: Lennert Buytenhek Date: Tue, 1 Nov 2005 19:44:25 +0000 (+0000) Subject: [ARM] 3063/1: allow slave ixp2000 cpu reset X-Git-Tag: v2.6.15-rc1~18^2~33^2~12 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69a857610ad212ce4bcd8e6b13f25408691403de;p=linux-2.6 [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 Signed-off-by: Deepak Saxena Signed-off-by: Russell King --- diff --git a/include/asm-arm/arch-ixp2000/system.h b/include/asm-arm/arch-ixp2000/system.h index 4f489cc0df..d9d6d9d07e 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; }