diff options
author | Stephen Boyd <sboyd@kernel.org> | 2019-02-15 15:58:37 -0800 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2019-02-15 15:58:37 -0800 |
commit | da392a5ab4111d336e2b2b724499ad05ee9845a0 (patch) | |
tree | a7eacb3ae3b6d9776616956f2e4221f4ee60e219 | |
parent | bfeffd155283772bbe78c6a05dec7c0128ee500c (diff) | |
parent | 108a459ef4cd17a28711d81092044e597b5c7618 (diff) | |
download | lwn-da392a5ab4111d336e2b2b724499ad05ee9845a0.tar.gz lwn-da392a5ab4111d336e2b2b724499ad05ee9845a0.zip |
Merge tag 'sunxi-clk-for-5.1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-allwinner
Pull Allwinner clock changes from Maxime Ripard:
- non-urgent fix for the PLL-MIPI on the A23
* tag 'sunxi-clk-for-5.1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
clk: sunxi-ng: sun8i-a23: Enable PLL-MIPI LDOs when ungating it
-rw-r--r-- | drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-a23.c b/drivers/clk/sunxi-ng/ccu-sun8i-a23.c index a4fa2945f230..4b5f8f4e4ab8 100644 --- a/drivers/clk/sunxi-ng/ccu-sun8i-a23.c +++ b/drivers/clk/sunxi-ng/ccu-sun8i-a23.c @@ -144,7 +144,7 @@ static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_mipi_clk, "pll-mipi", 8, 4, /* N */ 4, 2, /* K */ 0, 4, /* M */ - BIT(31), /* gate */ + BIT(31) | BIT(23) | BIT(22), /* gate */ BIT(28), /* lock */ CLK_SET_RATE_UNGATE); |