powerpc: mpc85xx: Move SECURE_BOOT to Kconfig

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

diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index a40a0552f5ec3be53c2937262367aabffe94e7c1..5498c19e253d84e3a53b67a6f6fc7d2ec0af6206 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -4,23 +4,7 @@
  *
  * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -186,7 +170,7 @@ int get_clocks(void)
                tsec1_clk = csb_clk / 3;
                break;
        default:
-               /* unkown SCCR_TSEC1CM value */
+               /* unknown SCCR_TSEC1CM value */
                return -2;
        }
 #endif
@@ -207,7 +191,7 @@ int get_clocks(void)
                usbdr_clk = csb_clk / 3;
                break;
        default:
-               /* unkown SCCR_USBDRCM value */
+               /* unknown SCCR_USBDRCM value */
                return -3;
        }
 #endif
@@ -228,7 +212,7 @@ int get_clocks(void)
                tsec2_clk = csb_clk / 3;
                break;
        default:
-               /* unkown SCCR_TSEC2CM value */
+               /* unknown SCCR_TSEC2CM value */
                return -4;
        }
 #elif defined(CONFIG_MPC8313)
@@ -255,7 +239,7 @@ int get_clocks(void)
                usbmph_clk = csb_clk / 3;
                break;
        default:
-               /* unkown SCCR_USBMPHCM value */
+               /* unknown SCCR_USBMPHCM value */
                return -5;
        }
 
@@ -282,7 +266,7 @@ int get_clocks(void)
                enc_clk = csb_clk / 3;
                break;
        default:
-               /* unkown SCCR_ENCCM value */
+               /* unknown SCCR_ENCCM value */
                return -7;
        }
 #endif
@@ -302,7 +286,7 @@ int get_clocks(void)
                sdhc_clk = csb_clk / 3;
                break;
        default:
-               /* unkown SCCR_SDHCCM value */
+               /* unknown SCCR_SDHCCM value */
                return -8;
        }
 #endif
@@ -321,7 +305,7 @@ int get_clocks(void)
                tdm_clk = csb_clk / 3;
                break;
        default:
-               /* unkown SCCR_TDMCM value */
+               /* unknown SCCR_TDMCM value */
                return -8;
        }
 #endif
@@ -361,7 +345,7 @@ int get_clocks(void)
                pciexp1_clk = csb_clk / 3;
                break;
        default:
-               /* unkown SCCR_PCIEXP1CM value */
+               /* unknown SCCR_PCIEXP1CM value */
                return -9;
        }
 
@@ -379,7 +363,7 @@ int get_clocks(void)
                pciexp2_clk = csb_clk / 3;
                break;
        default:
-               /* unkown SCCR_PCIEXP2CM value */
+               /* unknown SCCR_PCIEXP2CM value */
                return -10;
        }
 #endif
@@ -399,7 +383,7 @@ int get_clocks(void)
                sata_clk = csb_clk / 3;
                break;
        default:
-               /* unkown SCCR_SATACM value */
+               /* unknown SCCR_SATA1CM value */
                return -11;
        }
 #endif
@@ -428,8 +412,8 @@ int get_clocks(void)
 #endif
 
        corecnf_tab_index = ((corepll & 0x1F) << 2) | ((corepll & 0x60) >> 5);
-       if (corecnf_tab_index > (sizeof(corecnf_tab) / sizeof(corecnf_t))) {
-               /* corecnf_tab_index is too high, possibly worng value */
+       if (corecnf_tab_index > (ARRAY_SIZE(corecnf_tab))) {
+               /* corecnf_tab_index is too high, possibly wrong value */
                return -11;
        }
        switch (corecnf_tab[corecnf_tab_index].core_csb_ratio) {
@@ -451,7 +435,7 @@ int get_clocks(void)
                core_clk = 3 * csb_clk;
                break;
        default:
-               /* unkown core to csb ratio */
+               /* unknown core to csb ratio */
                return -13;
        }
 
@@ -478,7 +462,7 @@ int get_clocks(void)
        gd->arch.tdm_clk = tdm_clk;
 #endif
 #if defined(CONFIG_FSL_ESDHC)
-       gd->sdhc_clk = sdhc_clk;
+       gd->arch.sdhc_clk = sdhc_clk;
 #endif
        gd->arch.core_clk = core_clk;
        gd->arch.i2c1_clk = i2c1_clk;
@@ -495,7 +479,7 @@ int get_clocks(void)
        gd->arch.mem_sec_clk = mem_sec_clk;
 #endif
 #if defined(CONFIG_QE)
-       gd->qe_clk = qe_clk;
+       gd->arch.qe_clk = qe_clk;
        gd->arch.brg_clk = brg_clk;
 #endif
 #if defined(CONFIG_MPC8308) || defined(CONFIG_MPC831x) || \
@@ -541,7 +525,8 @@ static int do_clocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        printf("  Coherent System Bus: %-4s MHz\n",
               strmhz(buf, gd->arch.csb_clk));
 #if defined(CONFIG_QE)
-       printf("  QE:                  %-4s MHz\n", strmhz(buf, gd->qe_clk));
+       printf("  QE:                  %-4s MHz\n",
+              strmhz(buf, gd->arch.qe_clk));
        printf("  BRG:                 %-4s MHz\n",
               strmhz(buf, gd->arch.brg_clk));
 #endif
@@ -569,7 +554,8 @@ static int do_clocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
               strmhz(buf, gd->arch.tdm_clk));
 #endif
 #if defined(CONFIG_FSL_ESDHC)
-       printf("  SDHC:                %-4s MHz\n", strmhz(buf, gd->sdhc_clk));
+       printf("  SDHC:                %-4s MHz\n",
+              strmhz(buf, gd->arch.sdhc_clk));
 #endif
 #if defined(CONFIG_MPC8308) || defined(CONFIG_MPC831x) || \
        defined(CONFIG_MPC834x) || defined(CONFIG_MPC837x)