V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix PCIDF calculation in cpu/mpc8260/speed.c for MPC8280EC 

Patch by KokHow Teh, 16 Jun 2005
This commit is contained in:
Wolfgang Denk 2006-03-12 16:14:29 +01:00
parent 74f92e6a3f
commit 23466d6a33
2 changed files with 21 additions and 7 deletions
CHANGELOG
cpu/mpc8260
speed.c

3
CHANGELOG
View File

@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4: Changes since U-Boot 1.1.4:
====================================================================== ======================================================================
* Fix PCIDF calculation in cpu/mpc8260/speed.c for MPC8280EC
Patch by KokHow Teh, 16 Jun 2005
* Add crc of data to jffs2 (in jffs2_1pass_build_lists()). * Add crc of data to jffs2 (in jffs2_1pass_build_lists()).
Patch by Rick Bronson, 15 Jun 2005 Patch by Rick Bronson, 15 Jun 2005

25
cpu/mpc8260/speed.c
View File

@ -163,7 +163,7 @@ int prt_8260_clks (void)
volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile immap_t *immap = (immap_t *) CFG_IMMR;
ulong sccr, dfbrg; ulong sccr, dfbrg;
ulong scmr, corecnf, busdf, cpmdf, plldf, pllmf; ulong scmr, corecnf, busdf, cpmdf, plldf, pllmf, pcidf;
corecnf_t *cp; corecnf_t *cp;
sccr = immap->im_clkrst.car_sccr; sccr = immap->im_clkrst.car_sccr;
@ -175,6 +175,7 @@ int prt_8260_clks (void)
cpmdf = (scmr & SCMR_CPMDF_MSK) >> SCMR_CPMDF_SHIFT; cpmdf = (scmr & SCMR_CPMDF_MSK) >> SCMR_CPMDF_SHIFT;
plldf = (scmr & SCMR_PLLDF) ? 1 : 0; plldf = (scmr & SCMR_PLLDF) ? 1 : 0;
pllmf = (scmr & SCMR_PLLMF_MSK) >> SCMR_PLLMF_SHIFT; pllmf = (scmr & SCMR_PLLMF_MSK) >> SCMR_PLLMF_SHIFT;
pcidf = (sccr & SCCR_PCIDF_MSK) >> SCCR_PCIDF_SHIFT;
cp = &corecnf_tab[corecnf]; cp = &corecnf_tab[corecnf];
@ -204,8 +205,9 @@ int prt_8260_clks (void)
cp->vco_div, cp->freq_60x, cp->freq_core); cp->vco_div, cp->freq_60x, cp->freq_core);
printf (" - dfbrg %ld, corecnf 0x%02lx, busdf %ld, cpmdf %ld, " printf (" - dfbrg %ld, corecnf 0x%02lx, busdf %ld, cpmdf %ld, "
"plldf %ld, pllmf %ld\n", dfbrg, corecnf, busdf, cpmdf, plldf, "plldf %ld, pllmf %ld, pcidf %ld\n",
pllmf); dfbrg, corecnf, busdf, cpmdf,
plldf, pllmf, pcidf);
printf (" - vco_out %10ld, scc_clk %10ld, brg_clk %10ld\n", printf (" - vco_out %10ld, scc_clk %10ld, brg_clk %10ld\n",
gd->vco_out, gd->scc_clk, gd->brg_clk); gd->vco_out, gd->scc_clk, gd->brg_clk);
@ -215,9 +217,20 @@ int prt_8260_clks (void)
if (sccr & SCCR_PCI_MODE) { if (sccr & SCCR_PCI_MODE) {
uint pci_div; uint pci_div;
uint pcidf = (sccr & SCCR_PCIDF_MSK) >> SCCR_PCIDF_SHIFT;
pci_div = ( (sccr & SCCR_PCI_MODCK) ? 2 : 1) * if (sccr & SCCR_PCI_MODCK) {
( ( (sccr & SCCR_PCIDF_MSK) >> SCCR_PCIDF_SHIFT) + 1); pci_div = 2;
if (pcidf == 9) {
pci_div *= 5;
} else if (pcidf == 0xB) {
pci_div *= 6;
} else {
pci_div *= (pcidf + 1);
}
} else {
pci_div = pcidf + 1;
}
printf (" - pci_clk %10ld\n", (gd->cpm_clk * 2) / pci_div); printf (" - pci_clk %10ld\n", (gd->cpm_clk * 2) / pci_div);
} }
@ -225,5 +238,3 @@ int prt_8260_clks (void)
return (0); return (0);
} }
/* ------------------------------------------------------------------------- */