diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2017-12-20 15:19:23 +0100 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2017-12-20 15:21:25 +0100 |
| commit | b8c35c4f7fc4ff07589f09e76576c314c4be2e63 (patch) | |
| tree | 61cd967d251dc91bcbc47775875e474258ddf7cf | |
| parent | 5c40d18355144de87c364abe00e5c0a67812ba38 (diff) | |
HACK hi6220
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
| -rw-r--r-- | drivers/clk/hisilicon/clk-hi6220.c | 2 | ||||
| -rw-r--r-- | drivers/clk/hisilicon/clkgate-separated.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clk/hisilicon/clk-hi6220.c b/drivers/clk/hisilicon/clk-hi6220.c index e786d717f75d..451cc7f89093 100644 --- a/drivers/clk/hisilicon/clk-hi6220.c +++ b/drivers/clk/hisilicon/clk-hi6220.c @@ -145,7 +145,7 @@ static struct hisi_gate_clock hi6220_separated_gate_clks_sys[] __initdata = { { HI6220_BBPPLL_SEL, "bbppll_sel", "pll0_bbp_gate", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x270, 9, 0, }, { HI6220_MEDIA_PLL_SRC, "media_pll_src", "pll_media_gate", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x270, 10, 0, }, { HI6220_MMC2_SEL, "mmc2_sel", "mmc2_mux1", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x270, 11, 0, }, - { HI6220_CS_ATB_SYSPLL, "cs_atb_syspll", "syspll", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x270, 12, 0, }, + { HI6220_CS_ATB_SYSPLL, "cs_atb_syspll", "syspll", CLK_SET_RATE_PARENT|CLK_IS_CRITICAL, 0x270, 12, 0, }, }; static struct hisi_mux_clock hi6220_mux_clks_sys[] __initdata = { diff --git a/drivers/clk/hisilicon/clkgate-separated.c b/drivers/clk/hisilicon/clkgate-separated.c index 7908bc3c9ec7..738461c6f576 100644 --- a/drivers/clk/hisilicon/clkgate-separated.c +++ b/drivers/clk/hisilicon/clkgate-separated.c @@ -69,9 +69,11 @@ static void clkgate_separated_disable(struct clk_hw *hw) sclk = container_of(hw, struct clkgate_separated, hw); if (sclk->lock) spin_lock_irqsave(sclk->lock, flags); +#if 0 reg = BIT(sclk->bit_idx); writel_relaxed(reg, sclk->enable + CLKGATE_SEPERATED_DISABLE); readl_relaxed(sclk->enable + CLKGATE_SEPERATED_STATUS); +#endif if (sclk->lock) spin_unlock_irqrestore(sclk->lock, flags); } |