ChangeSet 1.2231.1.26, 2005/03/28 19:23:33-08:00, [EMAIL PROTECTED]
[PATCH] ppc32: Fix Sandpoint Soft Reboot
This patch allows the Freescale Sandpoint to perform soft reboots. A
write
of 0x00 to the Winbond's Chip Select Control Register was clearing the
Upper BIOS Chip Select Enable bit which unmaps the boot flash. The
comment
associated with the write noted that it was enabling the RTC and
Keyboard
address locations, but the bits in question (1 and 0) are reserved when
the
Winbond chip is in PowerPC mode. Also, the bits are 1 for enable, 0 for
disable, therefore the original code was actually disabling the address
locations. The patch also corrects errors in the definitions of 2
configuration bits in the Tundra Tsi107 bridge's MAPB Options register.
Signed-off-by Randy Vinson <[EMAIL PROTECTED]>
Signed-off-by Mark A. Greer <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
arch/ppc/platforms/sandpoint.c | 7 -------
include/asm-ppc/mpc10x.h | 4 ++--
2 files changed, 2 insertions(+), 9 deletions(-)
diff -Nru a/arch/ppc/platforms/sandpoint.c b/arch/ppc/platforms/sandpoint.c
--- a/arch/ppc/platforms/sandpoint.c 2005-03-28 21:12:06 -08:00
+++ b/arch/ppc/platforms/sandpoint.c 2005-03-28 21:12:06 -08:00
@@ -202,13 +202,6 @@
0x48, /* ISA-to-PCI Addr Decoder Control */
0xf0);
- /* Enable RTC and Keyboard address locations. */
- early_write_config_byte(hose,
- 0,
- devfn,
- 0x4d, /* Chip Select Control Register */
- 0x00);
-
/* Enable Port 92. */
early_write_config_byte(hose,
0,
diff -Nru a/include/asm-ppc/mpc10x.h b/include/asm-ppc/mpc10x.h
--- a/include/asm-ppc/mpc10x.h 2005-03-28 21:12:06 -08:00
+++ b/include/asm-ppc/mpc10x.h 2005-03-28 21:12:06 -08:00
@@ -115,8 +115,8 @@
#define MPC10X_CFG_MAPB_OPTIONS_CFAE 0x80 /* CPU_FD_ALIAS_EN */
#define MPC10X_CFG_MAPB_OPTIONS_PFAE 0x40 /* PCI_FD_ALIAS_EN */
#define MPC10X_CFG_MAPB_OPTIONS_DR 0x20 /* DLL_RESET */
-#define MPC10X_CFG_MAPB_OPTIONS_PCICH 0x80 /*
PCI_COMPATIBILITY_HOLE */
-#define MPC10X_CFG_MAPB_OPTIONS_PROCCH 0x40 /*
PROC_COMPATIBILITY_HOLE */
+#define MPC10X_CFG_MAPB_OPTIONS_PCICH 0x08 /*
PCI_COMPATIBILITY_HOLE */
+#define MPC10X_CFG_MAPB_OPTIONS_PROCCH 0x04 /*
PROC_COMPATIBILITY_HOLE */
/* Define offsets for the memory controller registers in the config space */
#define MPC10X_MCTLR_MEM_START_1 0x80 /* Banks 0-3 */
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
