From ab62e387cafb5e99819e24715dbc6496f5516e5a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Mon, 25 Aug 2014 14:30:07 +0200 Subject: [PATCH] karo: tx48: only print message about cpu_clk, if it was actually changed --- board/karo/tx48/tx48.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/board/karo/tx48/tx48.c b/board/karo/tx48/tx48.c index 8aafdebb6f..10b939095d 100644 --- a/board/karo/tx48/tx48.c +++ b/board/karo/tx48/tx48.c @@ -878,18 +878,31 @@ int checkboard(void) static void tx48_set_cpu_clock(void) { unsigned long cpu_clk = getenv_ulong("cpu_clk", 10, 0); + unsigned long act_cpu_clk; - if (had_ctrlc() || (prm_rstst & PRM_RSTST_WDT1_RST)) + if (cpu_clk == 0 || cpu_clk == mpu_clk_rate() / 1000000) return; - if (cpu_clk == 0 || cpu_clk == mpu_clk_rate() / 1000000) + if (had_ctrlc() || (prm_rstst & PRM_RSTST_WDT1_RST)) { + if (prm_rstst & PRM_RSTST_WDT1_RST) { + printf("Watchdog reset detected; skipping cpu clock change\n"); + } else { + printf(" detected; skipping cpu clock change\n"); + } return; + } mpu_pll_config_val(cpu_clk); - printf("CPU clock set to %lu.%03lu MHz\n", - mpu_clk_rate() / 1000000, - mpu_clk_rate() / 1000 % 1000); + act_cpu_clk = mpu_clk_rate(); + if (cpu_clk * 1000000 != act_cpu_clk) { + printf("Failed to set CPU clock to %lu MHz; using %lu.%03lu MHz instead\n", + cpu_clk, act_cpu_clk / 1000000, + act_cpu_clk / 1000 % 1000); + } else { + printf("CPU clock set to %lu.%03lu MHz\n", + act_cpu_clk / 1000000, act_cpu_clk / 1000 % 1000); + } } static void tx48_init_mac(void) -- 2.39.2