From: chenxing <chenxing@rock-chips.com>
Date: Mon, 23 Dec 2013 02:48:57 +0000 (+0800)
Subject: rk3188: revert clk-divider.c and clk-mux.c in drivers/clk/
X-Git-Tag: firefly_0821_release~6432
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b4902e5442b51e64ee0b952c900d2aba1a5cb47b;p=firefly-linux-kernel-4.4.55.git

rk3188: revert clk-divider.c and clk-mux.c in drivers/clk/
---

diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index 2c066abb2452..6d9674160430 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -220,7 +220,6 @@ static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
 	val = readl(divider->reg);
 	val &= ~(div_mask(divider) << divider->shift);
 	val |= value << divider->shift;
-	val |= (div_mask(divider) << (divider->shift + 16));
 	writel(val, divider->reg);
 
 	if (divider->lock)
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index 09f9e1e9f2de..25b1734560d0 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -89,8 +89,6 @@ static int clk_mux_set_parent(struct clk_hw *hw, u8 index)
 	val = readl(mux->reg);
 	val &= ~(mux->mask << mux->shift);
 	val |= index << mux->shift;
-	val |= (mux->mask << (mux->shift + 16));
-
 	writel(val, mux->reg);
 
 	if (mux->lock)