summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-01-23 16:22:57 -0600
committerKumar Gala <galak@kernel.crashing.org>2006-01-23 16:22:57 -0600
commitb97048094868fa03092f2c8e41b5eb22ea018a57 (patch)
treedd222fca8d45fcb6750fc38ee67d4ca29a647370
parentec00c335789aea61ec13f41356805c690f059572 (diff)
downloadblackbird-obmc-uboot-b97048094868fa03092f2c8e41b5eb22ea018a57.tar.gz
blackbird-obmc-uboot-b97048094868fa03092f2c8e41b5eb22ea018a57.zip
Fixed defines for MPC83xx SICRL register to match current specs
Patch by Kumar Gala, 23 Jan 2006
-rw-r--r--CHANGELOG3
-rw-r--r--include/asm-ppc/immap_83xx.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6dc76d26d5..12856fbb6c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Fixed defines for MPC83xx SICRL register to match current specs
+ Patch by Kumar Gala, 23 Jan 2006
+
* Only disable the MPC83xx watchdog if its enabled out of reset.
If its disabled out of reset SW can later enable it if so desired
Patch by Kumar Gala, 11 Jan 2006
diff --git a/include/asm-ppc/immap_83xx.h b/include/asm-ppc/immap_83xx.h
index 6c2c712a26..f5fec22c7f 100644
--- a/include/asm-ppc/immap_83xx.h
+++ b/include/asm-ppc/immap_83xx.h
@@ -71,8 +71,8 @@ typedef struct sysconf8349 {
| SPCR_TSEC2DP | SPCR_TSEC2BDP | SPCR_TSEC2EP)
u32 sicrl; /* System General Purpose Register Low */
#define SICRL_LDP_A 0x80000000
-#define SICRL_USB0 0x40000000
-#define SICRL_USB1 0x20000000
+#define SICRL_USB1 0x40000000
+#define SICRL_USB0 0x20000000
#define SICRL_UART 0x0C000000
#define SICRL_GPIO1_A 0x02000000
#define SICRL_GPIO1_B 0x01000000
OpenPOWER on IntegriCloud