Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

[u-boot] / cpu / arm1136 / mx31 / generic.c

diff --git a/cpu/arm1136/mx31/generic.c b/cpu/arm1136/mx31/generic.c
index 297d616d5e152d0644f77cca5b36c4c231d6e132..29c08c105f1e1d601b3f1ec0002cb914c3038324 100644 (file)
--- a/cpu/arm1136/mx31/generic.c
+++ b/cpu/arm1136/mx31/generic.c
@@ -39,7 +39,7 @@ static u32 mx31_decode_pll(u32 reg, u32 infreq)
                (mfd * pd)) << 10;
 }
 
-u32 mx31_get_mpl_dpdgck_clk(void)
+static u32 mx31_get_mpl_dpdgck_clk(void)
 {
        u32 infreq;
 
@@ -48,9 +48,10 @@ u32 mx31_get_mpl_dpdgck_clk(void)
        else
                infreq = CONFIG_MX31_HCLK_FREQ;
 
-       return mx31_decode_pll(__REG(CCM_MPCTL), infreq); }
+       return mx31_decode_pll(__REG(CCM_MPCTL), infreq);
+}
 
-u32 mx31_get_mcu_main_clk(void)
+static u32 mx31_get_mcu_main_clk(void)
 {
        /* For now we assume mpl_dpdgck_clk == mcu_main_clk
         * which should be correct for most boards
@@ -72,7 +73,7 @@ u32 mx31_get_ipg_clk(void)
 void mx31_dump_clocks(void)
 {
        u32 cpufreq = mx31_get_mcu_main_clk();
-       printf("mx31 cpu clock: %dMHz\n", cpufreq / 1000000);
+       printf("mx31 cpu clock: %dMHz\n",cpufreq / 1000000);
        printf("ipg clock     : %dHz\n", mx31_get_ipg_clk());
 }
 
@@ -90,7 +91,7 @@ void mx31_gpio_mux(unsigned long mode)
 }
 
 #if defined(CONFIG_DISPLAY_CPUINFO)
-int print_cpuinfo(void)
+int print_cpuinfo (void)
 {
        printf("CPU:   Freescale i.MX31 at %d MHz\n",
                mx31_get_mcu_main_clk() / 1000000);