summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorTrent Piepho <tpiepho@freescale.com>2008-12-03 15:16:34 -0800
committerAndrew Fleming-AFLEMING <afleming@freescale.com>2008-12-19 18:20:25 -0600
commita5d212a263c58cc746481bf1fc878510533ce7d6 (patch)
treeeb08c782227ec1399e96eb6dc082db2123262e41 /cpu
parent58ec4866ed916c7e422f5107bb27b0822084728e (diff)
downloadu-boot-imx-a5d212a263c58cc746481bf1fc878510533ce7d6.zip
u-boot-imx-a5d212a263c58cc746481bf1fc878510533ce7d6.tar.gz
u-boot-imx-a5d212a263c58cc746481bf1fc878510533ce7d6.tar.bz2
mpc8xxx: LCRR[CLKDIV] is sometimes five bits
On newer CPUs, 8536, 8572, and 8610, the CLKDIV field of LCRR is five bits instead of four. In order to avoid an ifdef, LCRR_CLKDIV is set to 0x1f on all systems. It should be safe as the fifth bit was defined as reserved and set to 0. Code that was using a hard coded 0x0f is changed to use LCRR_CLKDIV. Signed-off-by: Trent Piepho <tpiepho@freescale.com> Acked-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc85xx/cpu.c2
-rw-r--r--cpu/mpc86xx/cpu.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c
index 943602f..59a9ac8 100644
--- a/cpu/mpc85xx/cpu.c
+++ b/cpu/mpc85xx/cpu.c
@@ -174,7 +174,7 @@ int checkcpu (void)
lcrr = lbc->lcrr;
}
#endif
- clkdiv = lcrr & 0x0f;
+ clkdiv = lcrr & LCRR_CLKDIV;
if (clkdiv == 2 || clkdiv == 4 || clkdiv == 8) {
#if defined(CONFIG_MPC8548) || defined(CONFIG_MPC8544) || \
defined(CONFIG_MPC8572) || defined(CONFIG_MPC8536)
diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c
index 4cace98..0ff76e3 100644
--- a/cpu/mpc86xx/cpu.c
+++ b/cpu/mpc86xx/cpu.c
@@ -110,7 +110,7 @@ checkcpu(void)
lcrr = lbc->lcrr;
}
#endif
- clkdiv = lcrr & 0x0f;
+ clkdiv = lcrr & LCRR_CLKDIV;
if (clkdiv == 2 || clkdiv == 4 || clkdiv == 8) {
printf("LBC:%4lu MHz\n",
sysinfo.freqSystemBus / 1000000 / clkdiv);