From: Dario Binacchi <dariobin@libero.it>
Date: Sat, 2 May 2020 15:58:33 +0000 (+0200)
Subject: clk: ccf: mux: fix access to the sandbox register
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=e3b5d74c778a8782f763412679ca4c3cb2d496c3;p=u-boot.git

clk: ccf: mux: fix access to the sandbox register

The tests developed for the mux clock are run on the sandbox. They don't
call the clk_mux_set_parent routine and therefore they do not detect
this error.

Signed-off-by: Dario Binacchi <dariobin@libero.it>
---

diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index 978f3a8a14..e10baaf83b 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -131,12 +131,20 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent)
 	if (mux->flags & CLK_MUX_HIWORD_MASK) {
 		reg = mux->mask << (mux->shift + 16);
 	} else {
+#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF)
+		reg = mux->io_mux_val;
+#else
 		reg = readl(mux->reg);
+#endif
 		reg &= ~(mux->mask << mux->shift);
 	}
 	val = val << mux->shift;
 	reg |= val;
+#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF)
+	mux->io_mux_val = reg;
+#else
 	writel(reg, mux->reg);
+#endif
 
 	return 0;
 }