global_data: Reduce the size of bus_clk and mem_clk

The bus clock and memory clock are unlikely to go above 4GHz for now, so
reduce the field size to 32 bits.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/mips/mach-ath79/ar934x/clk.c b/arch/mips/mach-ath79/ar934x/clk.c
index bdaa6839a2bda2160be61485be3f0503fa8fe008..231a21ca90fe9f99bfc68fea4d1c42fcaf54acbb 100644 (file)
--- a/arch/mips/mach-ath79/ar934x/clk.c
+++ b/arch/mips/mach-ath79/ar934x/clk.c
@@ -327,8 +327,8 @@ int do_ar934x_showclk(struct cmd_tbl *cmdtp, int flag, int argc,
 {
        ar934x_update_clock();
        printf("CPU:       %8ld MHz\n", gd->cpu_clk / 1000000);
-       printf("Memory:    %8ld MHz\n", gd->mem_clk / 1000000);
-       printf("AHB:       %8ld MHz\n", gd->bus_clk / 1000000);
+       printf("Memory:    %8d MHz\n", gd->mem_clk / 1000000);
+       printf("AHB:       %8d MHz\n", gd->bus_clk / 1000000);
        return 0;
 }
 

diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c
index c7744e8470684405b378b5d788106bb3f28888e0..c771da61a6861c8ca4639603d9430f662e921772 100644 (file)
--- a/arch/mips/mach-octeon/cpu.c
+++ b/arch/mips/mach-octeon/cpu.c
@@ -67,7 +67,7 @@ static int get_clocks(void)
        gd->cpu_clk = ref_clock * FIELD_GET(RST_BOOT_C_MUL, val);
        gd->bus_clk = ref_clock * FIELD_GET(RST_BOOT_PNR_MUL, val);
 
-       debug("%s: cpu: %lu, bus: %lu\n", __func__, gd->cpu_clk, gd->bus_clk);
+       debug("%s: cpu: %lu, bus: %u\n", __func__, gd->cpu_clk, gd->bus_clk);
 
        return 0;
 }

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 094e97449f654985c89bb25f49dd83e16b2e4edf..0c8801500f07a27373f2b9452ac1e341ac55df25 100644 (file)
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -66,11 +66,11 @@ struct global_data {
        /**
         * @bus_clk: platform clock rate in Hz
         */
-       unsigned long bus_clk;
+       unsigned int bus_clk;
        /**
         * @mem_clk: memory clock rate in Hz
         */
-       unsigned long mem_clk;
+       unsigned int mem_clk;
        /**
         * @env_addr: address of environment structure
         *