diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-01-23 16:24:29 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-01-23 16:24:29 -0600 |
| commit | 27afa7d966678a7fa506aa6827a2090a085621a6 (patch) | |
| tree | 24572a4ccc620d6565a4b092238d88149eba5205 | |
| parent | b443f7b628bf9e9ba9cd93589c1fea8b908edd22 (diff) | |
| parent | b97048094868fa03092f2c8e41b5eb22ea018a57 (diff) | |
| download | u-boot-imx-27afa7d966678a7fa506aa6827a2090a085621a6.zip u-boot-imx-27afa7d966678a7fa506aa6827a2090a085621a6.tar.gz u-boot-imx-27afa7d966678a7fa506aa6827a2090a085621a6.tar.bz2 | |
Merge branch 'mpc83xx'
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | include/asm-ppc/immap_83xx.h | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -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 + * Fixed PCI indirect config ops to handle multiple PCI controllers We need to adjust the bus number we are trying to access based on which PCI controller its on diff --git a/include/asm-ppc/immap_83xx.h b/include/asm-ppc/immap_83xx.h index 6c2c712..f5fec22 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 |