diff options
author | Julia Cartwright <julia@ni.com> | 2018-01-15 13:09:37 -0600 |
---|---|---|
committer | Julia Cartwright <julia@ni.com> | 2018-01-15 13:09:37 -0600 |
commit | 223a1a424ccc1a22fa77500bb1bced246d5dd855 (patch) | |
tree | 35a62e7275ac840c7b20faa8cc40fe9798bcc950 /drivers/clk/hisilicon/clk-hi6220.c | |
parent | 0c37397b6b8708f3cae24a8faeed2d1c84760892 (diff) | |
parent | 7bbc6ca4887794cc44b41412a35bdfbe0cbd1c50 (diff) |
Merge tag 'v4.9.76' into v4.9-rt
This is the 4.9.76 stable release
Diffstat (limited to 'drivers/clk/hisilicon/clk-hi6220.c')
-rw-r--r-- | drivers/clk/hisilicon/clk-hi6220.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/hisilicon/clk-hi6220.c b/drivers/clk/hisilicon/clk-hi6220.c index c0e8e1f196aa..2bfaf22e6ffc 100644 --- a/drivers/clk/hisilicon/clk-hi6220.c +++ b/drivers/clk/hisilicon/clk-hi6220.c @@ -144,7 +144,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 = { |