diff options
author | Chen-Yu Tsai <wens@csie.org> | 2017-05-02 23:13:46 -0400 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-05-14 02:27:17 -0400 |
commit | 38b8f823864707eb1cf331d2247608c419ed388c (patch) | |
tree | 76a9d4bfc0966e8feda8297c0df5a404ec6e60f9 | |
parent | 2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff) |
clk: sunxi-ng: a31: Correct lcd1-ch1 clock register offset
The register offset for the lcd1-ch1 clock was incorrectly pointing to
the lcd0-ch1 clock. This resulted in the lcd0-ch1 clock being disabled
when the clk core disables unused clocks. This then stops the simplefb
HDMI output path.
Reported-by: Bob Ham <rah@settrans.net>
Fixes: c6e6c96d8fa6 ("clk: sunxi-ng: Add A31/A31s clocks")
Cc: stable@vger.kernel.org # 4.9.x-
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-rw-r--r-- | drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c index 89e68d29bf45..df97e25aec76 100644 --- a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c +++ b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c | |||
@@ -556,7 +556,7 @@ static SUNXI_CCU_M_WITH_MUX_GATE(lcd0_ch1_clk, "lcd0-ch1", lcd_ch1_parents, | |||
556 | 0x12c, 0, 4, 24, 3, BIT(31), | 556 | 0x12c, 0, 4, 24, 3, BIT(31), |
557 | CLK_SET_RATE_PARENT); | 557 | CLK_SET_RATE_PARENT); |
558 | static SUNXI_CCU_M_WITH_MUX_GATE(lcd1_ch1_clk, "lcd1-ch1", lcd_ch1_parents, | 558 | static SUNXI_CCU_M_WITH_MUX_GATE(lcd1_ch1_clk, "lcd1-ch1", lcd_ch1_parents, |
559 | 0x12c, 0, 4, 24, 3, BIT(31), | 559 | 0x130, 0, 4, 24, 3, BIT(31), |
560 | CLK_SET_RATE_PARENT); | 560 | CLK_SET_RATE_PARENT); |
561 | 561 | ||
562 | static const char * const csi_sclk_parents[] = { "pll-video0", "pll-video1", | 562 | static const char * const csi_sclk_parents[] = { "pll-video0", "pll-video1", |