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 2c066abb2452282811deb75f9004c10e4c5ea4cd..6d9674160430db7456b58c1697272a801b68ba52 100644 (file)
--- 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 09f9e1e9f2de0956f5e9c2a93c8f6f5d8c8d3723..25b1734560d0c99bbae8455c78d22d613ccb99c0 100644 (file)
--- 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)