switch to using kernel 5.2.21, drop merged in patch
This commit is contained in:
parent
31c21eb845
commit
f9e7de8b1a
2
makefile
2
makefile
@ -13,7 +13,7 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with PrawnOS. If not, see <https://www.gnu.org/licenses/>.
|
# along with PrawnOS. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
KVER=5.2.9
|
KVER=5.2.21
|
||||||
ifeq ($(PRAWNOS_SUITE),)
|
ifeq ($(PRAWNOS_SUITE),)
|
||||||
PRAWNOS_SUITE=buster
|
PRAWNOS_SUITE=buster
|
||||||
endif
|
endif
|
||||||
|
@ -1,46 +0,0 @@
|
|||||||
From: Douglas Anderson <dianders@chromium.org>
|
|
||||||
Subject: [PATCH] clk: rockchip: Don't yell about bad mmc phases when getting
|
|
||||||
Date: Fri, 3 May 2019 14:22:08 -0700
|
|
||||||
|
|
||||||
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>
|
|
||||||
---
|
|
||||||
|
|
||||||
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 026a26bb702d..dbec84238ecd 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.21.0.1020.gf2820cf01a-goog
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user