From dd74b945af2e67791613dc98c6ce7a0058f3a72b Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Fri, 13 Oct 2017 19:21:55 +0900
Subject: [PATCH] ARM: uniphier: use pr_() instead of printf() where
appropriate
Replace printf() with pr_() to specify proper loglevel.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/arm/mach-uniphier/arm32/psci.c | 4 +++-
arch/arm/mach-uniphier/board_late_init.c | 4 +++-
.../mach-uniphier/boot-device/boot-device.c | 1 +
arch/arm/mach-uniphier/cpu-info.c | 7 ++++---
arch/arm/mach-uniphier/dram/cmd_ddrmphy.c | 4 +++-
arch/arm/mach-uniphier/dram/cmd_ddrphy.c | 4 +++-
arch/arm/mach-uniphier/dram/ddrphy-ld4.c | 5 +++--
arch/arm/mach-uniphier/dram/umc-pxs2.c | 18 ++++++++++--------
arch/arm/mach-uniphier/dram_init.c | 7 +++++--
9 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c
index 3ab101a9cf..efe7419cc9 100644
--- a/arch/arm/mach-uniphier/arm32/psci.c
+++ b/arch/arm/mach-uniphier/arm32/psci.c
@@ -7,8 +7,10 @@
#include <common.h>
#include <linux/bitops.h>
+#include <linux/delay.h>
#include <linux/io.h>
#include <linux/kernel.h>
+#include <linux/printk.h>
#include <linux/psci.h>
#include <linux/sizes.h>
#include <asm/processor.h>
@@ -91,7 +93,7 @@ static void uniphier_smp_kick_all_cpus(void)
}
if (!timeout)
- printf("warning: some of secondary CPUs may not boot\n");
+ pr_warn("warning: some of secondary CPUs may not boot\n");
uniphier_cache_disable();
}
diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index b9a2cbe148..6849b3dcab 100644
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -10,7 +10,9 @@
#include <spl.h>
#include <libfdt.h>
#include <nand.h>
+#include <stdio.h>
#include <linux/io.h>
+#include <linux/printk.h>
#include <../drivers/mtd/nand/denali.h>
#include "init.h"
@@ -92,7 +94,7 @@ int board_late_init(void)
printf("\n");
if (uniphier_set_fdt_file())
- printf("fdt_file environment was not set correctly\n");
+ pr_warn("fdt_file environment was not set correctly\n");
return 0;
}
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c
index 0f93926f28..2818b506c4 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <spl.h>
+#include <stdio.h>
#include <linux/log2.h>
#include "../init.h"
diff --git a/arch/arm/mach-uniphier/cpu-info.c b/arch/arm/mach-uniphier/cpu-info.c
index 90ef411087..bf41d0561c 100644
--- a/arch/arm/mach-uniphier/cpu-info.c
+++ b/arch/arm/mach-uniphier/cpu-info.c
@@ -6,9 +6,10 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#include <common.h>
+#include <stdio.h>
#include <linux/errno.h>
#include <linux/io.h>
+#include <linux/printk.h>
#include "soc-info.h"
@@ -59,11 +60,11 @@ int print_cpuinfo(void)
printf(" (model %d, revision %d)\n", model, rev);
if (model < required_model) {
- printf("Only model %d or newer is supported.\n",
+ pr_err("Only model %d or newer is supported.\n",
required_model);
return -ENOTSUPP;
} else if (rev < required_rev) {
- printf("Only revision %d or newer is supported.\n",
+ pr_err("Only revision %d or newer is supported.\n",
required_rev);
return -ENOTSUPP;
}
diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
index 873dad229a..50f0dde544 100644
--- a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
+++ b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
@@ -6,7 +6,9 @@
*/
#include <common.h>
+#include <stdio.h>
#include <linux/io.h>
+#include <linux/printk.h>
#include <linux/sizes.h>
#include "../soc-info.h"
@@ -297,7 +299,7 @@ static int do_ddrm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
param = uniphier_get_ddrmphy_param();
if (!param) {
- printf("unsupported SoC\n");
+ pr_err("unsupported SoC\n");
return CMD_RET_FAILURE;
}
diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
index a71f704b0c..0283edaeda 100644
--- a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
+++ b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
@@ -7,7 +7,9 @@
*/
#include <common.h>
+#include <stdio.h>
#include <linux/io.h>
+#include <linux/printk.h>
#include <linux/sizes.h>
#include "../soc-info.h"
@@ -267,7 +269,7 @@ static int do_ddr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
param = uniphier_get_ddrphy_param();
if (!param) {
- printf("unsupported SoC\n");
+ pr_err("unsupported SoC\n");
return CMD_RET_FAILURE;
}
diff --git a/arch/arm/mach-uniphier/dram/ddrphy-ld4.c b/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
index c20730d820..ba3d314841 100644
--- a/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
+++ b/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
@@ -5,9 +5,10 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#include <common.h>
+#include <linux/bitops.h>
#include <linux/errno.h>
#include <linux/io.h>
+#include <linux/printk.h>
#include "ddrphy-init.h"
#include "ddrphy-regs.h"
@@ -41,7 +42,7 @@ int uniphier_ld4_ddrphy_init(void __iomem *phy_base, int freq, bool ddr3plus)
freq_e = DRAM_FREQ_1600M;
break;
default:
- printf("unsupported DRAM frequency %d MHz\n", freq);
+ pr_err("unsupported DRAM frequency %d MHz\n", freq);
return -EINVAL;
}
diff --git a/arch/arm/mach-uniphier/dram/umc-pxs2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c
index 8068ef1388..fccdb98ed8 100644
--- a/arch/arm/mach-uniphier/dram/umc-pxs2.c
+++ b/arch/arm/mach-uniphier/dram/umc-pxs2.c
@@ -8,11 +8,13 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#include <common.h>
+#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/io.h>
+#include <linux/printk.h>
#include <linux/sizes.h>
#include <asm/processor.h>
+#include <time.h>
#include "../init.h"
#include "../soc-info.h"
@@ -134,7 +136,7 @@ static int ddrphy_get_system_latency(void __iomem *phy_base, int width)
}
if (dgsl_min != dgsl_max)
- printf("DQS Gateing System Latencies are not all leveled.\n");
+ pr_warn("DQS Gateing System Latencies are not all leveled.\n");
return dgsl_max;
}
@@ -149,7 +151,7 @@ static void ddrphy_init(void __iomem *phy_base, enum dram_freq freq, int width,
nr_dx = width / 8;
- writel(MPHY_PIR_ZCALBYP, phy_base + MPHY_PIR);
+ writel(MPHY_PIR_ZCALBYP, phy_base + MPHY_PIR);
/*
* Disable RGLVT bit (Read DQS Gating LCDL Delay VT Compensation)
* to avoid read error issue.
@@ -315,8 +317,10 @@ static int __ddrphy_training(void __iomem *phy_base,
u32 init_flag = MPHY_PIR_INIT;
u32 done_flag = MPHY_PGSR0_IDONE;
int timeout = 50000; /* 50 msec is long enough */
-#ifdef DISPLAY_ELAPSED_TIME
- ulong start = get_timer(0);
+ unsigned long start = 0;
+
+#ifdef DEBUG
+ start = get_timer(0);
#endif
for (s = seq; s->description; s++) {
@@ -344,9 +348,7 @@ static int __ddrphy_training(void __iomem *phy_base,
}
}
-#ifdef DISPLAY_ELAPSED_TIME
- printf("%s: info: elapsed time %ld msec\n", get_timer(start));
-#endif
+ pr_debug("DDRPHY training: elapsed time %ld msec\n", get_timer(start));
return 0;
}
diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c
index 22136855fa..e9672d2f1b 100644
--- a/arch/arm/mach-uniphier/dram_init.c
+++ b/arch/arm/mach-uniphier/dram_init.c
@@ -10,7 +10,10 @@
#include <fdt_support.h>
#include <fdtdec.h>
#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/printk.h>
#include <linux/sizes.h>
+#include <asm/global_data.h>
#include "sg-regs.h"
#include "soc-info.h"
@@ -264,8 +267,8 @@ int ft_board_setup(void *fdt, bd_t *bd)
if (ret)
return -ENOSPC;
- printf(" Reserved memory region for DRAM PHY training: addr=%lx size=%lx\n",
- rsv_addr, rsv_size);
+ pr_notice(" Reserved memory region for DRAM PHY training: addr=%lx size=%lx\n",
+ rsv_addr, rsv_size);
}
return 0;
--
2.39.5