From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Mon, 25 Aug 2014 12:30:07 +0000 (+0200)
Subject: karo: tx48: only print message about cpu_clk, if it was actually changed
X-Git-Tag: KARO-TX-2014-08-27~3
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=ab62e387cafb5e99819e24715dbc6496f5516e5a;hp=52f5f437531f602e1fee58ae1b56c1939d7d287f

karo: tx48: only print message about cpu_clk, if it was actually changed
---

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("<CTRL-C> 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)