On Sat, Jun 3, 2017 at 3:30 AM, Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx> wrote: > On Fri, Jun 02, 2017 at 06:10:15PM +0800, Chen-Yu Tsai wrote: >> The DDC parent clock on the A31 SoC is also conveniently named >> "hdmi-ddc", which results in a name collision when the hdmi driver >> registers its internal DDC divider clock. >> >> Rename the internal clock to "hdmi-ddc-divider". >> >> Signed-off-by: Chen-Yu Tsai <wens@xxxxxxxx> >> --- >> drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c >> index e1071838f487..9a6b6243e977 100644 >> --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c >> +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c >> @@ -125,7 +125,7 @@ static int _sun4i_ddc_create(struct sun4i_hdmi *hdmi, struct clk *parent, >> if (!ddc) >> return -ENOMEM; >> >> - init.name = "hdmi-ddc"; >> + init.name = "hdmi-ddc-divider"; > > Can't we rename the CCU clock instead? Having the clock called > hdmi-ddc being the actual clock output on the DDC bus feels more > natural. Do you have any suggestions? The manual labels the conflicting one in the CCU as "HDMI_DDC"... ChenYu -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html