Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-19 14:33:00 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-19 14:33:16 +0200
commit66dee7e7f300492a79bcd21c0069a8ea8305486b (patch)
treec215bc78272a501d8746181c46a22e6c941513b7
parentcb6e54df20a61b22c3a97992040c5088f126e188 (diff)
clk: rockchip: Don't yell about bad mmc phases when getting
(bsc#1051510).
-rw-r--r--patches.drivers/clk-rockchip-Don-t-yell-about-bad-mmc-phases-when-ge.patch52
-rw-r--r--series.conf1
2 files changed, 53 insertions, 0 deletions
diff --git a/patches.drivers/clk-rockchip-Don-t-yell-about-bad-mmc-phases-when-ge.patch b/patches.drivers/clk-rockchip-Don-t-yell-about-bad-mmc-phases-when-ge.patch
new file mode 100644
index 0000000000..49795603d8
--- /dev/null
+++ b/patches.drivers/clk-rockchip-Don-t-yell-about-bad-mmc-phases-when-ge.patch
@@ -0,0 +1,52 @@
+From 6943b839721ad4a31ad2bacf6e71b21f2dfe3134 Mon Sep 17 00:00:00 2001
+From: Douglas Anderson <dianders@chromium.org>
+Date: Fri, 3 May 2019 14:22:08 -0700
+Subject: [PATCH] clk: rockchip: Don't yell about bad mmc phases when getting
+Git-commit: 6943b839721ad4a31ad2bacf6e71b21f2dfe3134
+Patch-mainline: 5.3-rc1
+References: bsc#1051510
+
+At boot time, my rk3288-veyron devices yell with 8 lines that look
+like this:
+ [ 0.000000] rockchip_mmc_get_phase: invalid clk rate
+
+This is because the clock framework at clk_register() time tries to
+get the phase but we don't have a parent yet.
+
+While the errors appear to be harmless they are still ugly and, in
+general, we don't want yells like this in the log unless they are
+important.
+
+There's no real reason to be yelling here. We can still return
+-EINVAL to indicate that the phase makes no sense without a parent.
+If someone really tries to do tuning and the clock is reported as 0
+then we'll see the yells in rockchip_mmc_set_phase().
+
+Fixes: 4bf59902b500 ("clk: rockchip: Prevent calculating mmc phase if clock rate is zero")
+Signed-off-by: Douglas Anderson <dianders@chromium.org>
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/clk/rockchip/clk-mmc-phase.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/drivers/clk/rockchip/clk-mmc-phase.c b/drivers/clk/rockchip/clk-mmc-phase.c
+index 07526f64dbfd..17662217d1bb 100644
+--- a/drivers/clk/rockchip/clk-mmc-phase.c
++++ b/drivers/clk/rockchip/clk-mmc-phase.c
+@@ -61,10 +61,8 @@ static int rockchip_mmc_get_phase(struct clk_hw *hw)
+ u32 delay_num = 0;
+
+ /* See the comment for rockchip_mmc_set_phase below */
+- if (!rate) {
+- pr_err("%s: invalid clk rate\n", __func__);
++ if (!rate)
+ return -EINVAL;
+- }
+
+ raw_value = readl(mmc_clock->reg) >> (mmc_clock->shift);
+
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index bddd9631b2..879ad66f29 100644
--- a/series.conf
+++ b/series.conf
@@ -22948,6 +22948,7 @@
patches.drivers/dmaengine-hsu-Revert-set-HSU_CH_MTSR-to-memory-width.patch
patches.drivers/clk-qcom-Fix-Wunused-const-variable.patch
patches.drivers/clk-tegra210-fix-PLLU-and-PLLU_OUT1.patch
+ patches.drivers/clk-rockchip-Don-t-yell-about-bad-mmc-phases-when-ge.patch
patches.drivers/ALSA-hda-realtek-Fixed-Headphone-Mic-can-t-record-on.patch
patches.drivers/ALSA-hda-realtek-apply-ALC891-headset-fixup-to-one-D.patch
patches.drivers/ALSA-seq-Break-too-long-mutex-context-in-the-write-l.patch