mpc83xx: serdes: add forgotten shifts for rfcks

[oweals/u-boot.git] / cpu / mpc83xx / speed.c

diff --git a/cpu/mpc83xx/speed.c b/cpu/mpc83xx/speed.c
index 61c937981c3bd270e1f3fc333c335d651e4c8dde..bf9bf36e5f1766ffc65f3056a13e4b069ee41e3c 100644 (file)
--- a/cpu/mpc83xx/speed.c
+++ b/cpu/mpc83xx/speed.c
@@ -90,7 +90,7 @@ corecnf_t corecnf_tab[] = {
  */
 int get_clocks(void)
 {
-       volatile immap_t *im = (immap_t *) CFG_IMMR;
+       volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
        u32 pci_sync_in;
        u8 spmf;
        u8 clkin_div;
@@ -122,9 +122,9 @@ int get_clocks(void)
        u32 enc_clk;
        u32 lbiu_clk;
        u32 lclk_clk;
-       u32 ddr_clk;
+       u32 mem_clk;
 #if defined(CONFIG_MPC8360)
-       u32 ddr_sec_clk;
+       u32 mem_sec_clk;
 #endif
 #if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832X)
        u32 qepmf;
@@ -367,17 +367,17 @@ int get_clocks(void)
 #endif
 
 #if defined(CONFIG_MPC837X) || defined(CONFIG_MPC8315)
-       switch ((sccr & SCCR_SATACM) >> SCCR_SATACM_SHIFT) {
-       case SCCR_SATACM_0:
+       switch ((sccr & SCCR_SATA1CM) >> SCCR_SATA1CM_SHIFT) {
+       case 0:
                sata_clk = 0;
                break;
-       case SCCR_SATACM_1:
+       case 1:
                sata_clk = csb_clk;
                break;
-       case SCCR_SATACM_2:
+       case 2:
                sata_clk = csb_clk / 2;
                break;
-       case SCCR_SATACM_3:
+       case 3:
                sata_clk = csb_clk / 3;
                break;
        default:
@@ -400,11 +400,11 @@ int get_clocks(void)
                return -12;
        }
 
-       ddr_clk = csb_clk *
+       mem_clk = csb_clk *
                  (1 + ((im->reset.rcwl & HRCWL_DDRCM) >> HRCWL_DDRCM_SHIFT));
        corepll = (im->reset.rcwl & HRCWL_COREPLL) >> HRCWL_COREPLL_SHIFT;
 #if defined(CONFIG_MPC8360)
-       ddr_sec_clk = csb_clk * (1 +
+       mem_sec_clk = csb_clk * (1 +
                       ((im->reset.rcwl & HRCWL_LBIUCM) >> HRCWL_LBIUCM_SHIFT));
 #endif
 
@@ -466,9 +466,9 @@ int get_clocks(void)
        gd->enc_clk = enc_clk;
        gd->lbiu_clk = lbiu_clk;
        gd->lclk_clk = lclk_clk;
-       gd->ddr_clk = ddr_clk;
+       gd->mem_clk = mem_clk;
 #if defined(CONFIG_MPC8360)
-       gd->ddr_sec_clk = ddr_sec_clk;
+       gd->mem_sec_clk = mem_sec_clk;
 #endif
 #if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832X)
        gd->qe_clk = qe_clk;
@@ -499,44 +499,46 @@ ulong get_bus_freq(ulong dummy)
 
 int do_clocks (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
+       char buf[32];
+
        printf("Clock configuration:\n");
-       printf("  Core:                %4d MHz\n", gd->core_clk / 1000000);
-       printf("  Coherent System Bus: %4d MHz\n", gd->csb_clk / 1000000);
+       printf("  Core:                %-4s MHz\n", strmhz(buf, gd->core_clk));
+       printf("  Coherent System Bus: %-4s MHz\n", strmhz(buf, gd->csb_clk));
 #if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832X)
-       printf("  QE:                  %4d MHz\n", gd->qe_clk / 1000000);
-       printf("  BRG:                 %4d MHz\n", gd->brg_clk / 1000000);
+       printf("  QE:                  %-4s MHz\n", strmhz(buf, gd->qe_clk));
+       printf("  BRG:                 %-4s MHz\n", strmhz(buf, gd->brg_clk));
 #endif
-       printf("  Local Bus Controller:%4d MHz\n", gd->lbiu_clk / 1000000);
-       printf("  Local Bus:           %4d MHz\n", gd->lclk_clk / 1000000);
-       printf("  DDR:                 %4d MHz\n", gd->ddr_clk / 1000000);
+       printf("  Local Bus Controller:%-4s MHz\n", strmhz(buf, gd->lbiu_clk));
+       printf("  Local Bus:           %-4s MHz\n", strmhz(buf, gd->lclk_clk));
+       printf("  DDR:                 %-4s MHz\n", strmhz(buf, gd->mem_clk));
 #if defined(CONFIG_MPC8360)
-       printf("  DDR Secondary:       %4d MHz\n", gd->ddr_sec_clk / 1000000);
+       printf("  DDR Secondary:       %-4s MHz\n", strmhz(buf, gd->mem_sec_clk));
 #endif
-       printf("  SEC:                 %4d MHz\n", gd->enc_clk / 1000000);
-       printf("  I2C1:                %4d MHz\n", gd->i2c1_clk / 1000000);
+       printf("  SEC:                 %-4s MHz\n", strmhz(buf, gd->enc_clk));
+       printf("  I2C1:                %-4s MHz\n", strmhz(buf, gd->i2c1_clk));
 #if !defined(CONFIG_MPC832X)
-       printf("  I2C2:                %4d MHz\n", gd->i2c2_clk / 1000000);
+       printf("  I2C2:                %-4s MHz\n", strmhz(buf, gd->i2c2_clk));
 #endif
 #if defined(CONFIG_MPC8315)
-       printf("  TDM:                 %4d MHz\n", gd->tdm_clk / 1000000);
+       printf("  TDM:                 %-4s MHz\n", strmhz(buf, gd->tdm_clk));
 #endif
 #if defined(CONFIG_MPC837X)
-       printf("  SDHC:                %4d MHz\n", gd->sdhc_clk / 1000000);
+       printf("  SDHC:                %-4s MHz\n", strmhz(buf, gd->sdhc_clk));
 #endif
 #if defined(CONFIG_MPC834X) || defined(CONFIG_MPC831X) || defined(CONFIG_MPC837X)
-       printf("  TSEC1:               %4d MHz\n", gd->tsec1_clk / 1000000);
-       printf("  TSEC2:               %4d MHz\n", gd->tsec2_clk / 1000000);
-       printf("  USB DR:              %4d MHz\n", gd->usbdr_clk / 1000000);
+       printf("  TSEC1:               %-4s MHz\n", strmhz(buf, gd->tsec1_clk));
+       printf("  TSEC2:               %-4s MHz\n", strmhz(buf, gd->tsec2_clk));
+       printf("  USB DR:              %-4s MHz\n", strmhz(buf, gd->usbdr_clk));
 #endif
 #if defined(CONFIG_MPC834X)
-       printf("  USB MPH:             %4d MHz\n", gd->usbmph_clk / 1000000);
+       printf("  USB MPH:             %-4s MHz\n", strmhz(buf, gd->usbmph_clk));
 #endif
 #if defined(CONFIG_MPC837X)
-       printf("  PCIEXP1:             %4d MHz\n", gd->pciexp1_clk / 1000000);
-       printf("  PCIEXP2:             %4d MHz\n", gd->pciexp2_clk / 1000000);
+       printf("  PCIEXP1:             %-4s MHz\n", strmhz(buf, gd->pciexp1_clk));
+       printf("  PCIEXP2:             %-4s MHz\n", strmhz(buf, gd->pciexp2_clk));
 #endif
 #if defined(CONFIG_MPC837X) || defined(CONFIG_MPC8315)
-       printf("  SATA:                %4d MHz\n", gd->sata_clk / 1000000);
+       printf("  SATA:                %-4s MHz\n", strmhz(buf, gd->sata_clk));
 #endif
        return 0;
 }