| From foo@baz Thu Dec 21 09:02:40 CET 2017 |
| From: Chen-Yu Tsai <wens@csie.org> |
| Date: Fri, 29 Sep 2017 16:22:54 +0800 |
| Subject: clk: sunxi-ng: sun6i: Rename HDMI DDC clock to avoid name collision |
| |
| From: Chen-Yu Tsai <wens@csie.org> |
| |
| |
| [ Upstream commit 7f3ed79188f2f094d0ee366fa858857fb7f511ba ] |
| |
| The HDMI DDC clock found in the CCU is the parent of the actual DDC |
| clock within the HDMI controller. That clock is also named "hdmi-ddc". |
| |
| Rename the one in the CCU to "ddc". This makes more sense than renaming |
| the one in the HDMI controller to something else. |
| |
| Fixes: c6e6c96d8fa6 ("clk: sunxi-ng: Add A31/A31s clocks") |
| Signed-off-by: Chen-Yu Tsai <wens@csie.org> |
| Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c |
| +++ b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c |
| @@ -608,7 +608,7 @@ static SUNXI_CCU_M_WITH_MUX_GATE(hdmi_cl |
| 0x150, 0, 4, 24, 2, BIT(31), |
| CLK_SET_RATE_PARENT); |
| |
| -static SUNXI_CCU_GATE(hdmi_ddc_clk, "hdmi-ddc", "osc24M", 0x150, BIT(30), 0); |
| +static SUNXI_CCU_GATE(hdmi_ddc_clk, "ddc", "osc24M", 0x150, BIT(30), 0); |
| |
| static SUNXI_CCU_GATE(ps_clk, "ps", "lcd1-ch1", 0x140, BIT(31), 0); |
| |
