Both DSS L3 and L4 interface clocks are controlled by the same bit.
Just use a single clock node to control them, and rename it to dss_ick
as is done for 24xx.
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
.recalc = &followparent_recalc,
};
.recalc = &followparent_recalc,
};
-static struct clk dss_l3_ick = {
- .name = "dss_l3_ick",
- .parent = &l3_ick,
- .enable_reg = OMAP_CM_REGADDR(OMAP3430_DSS_MOD, CM_ICLKEN),
- .enable_bit = OMAP3430_CM_ICLKEN_DSS_EN_DSS_SHIFT,
- .flags = CLOCK_IN_OMAP343X,
- .recalc = &followparent_recalc,
-};
-
-static struct clk dss_l4_ick = {
- .name = "dss_l4_ick",
+static struct clk dss_ick = {
+ /* Handles both L3 and L4 clocks */
+ .name = "dss_ick",
.parent = &l4_ick,
.enable_reg = OMAP_CM_REGADDR(OMAP3430_DSS_MOD, CM_ICLKEN),
.enable_bit = OMAP3430_CM_ICLKEN_DSS_EN_DSS_SHIFT,
.parent = &l4_ick,
.enable_reg = OMAP_CM_REGADDR(OMAP3430_DSS_MOD, CM_ICLKEN),
.enable_bit = OMAP3430_CM_ICLKEN_DSS_EN_DSS_SHIFT,
&dss_tv_fck,
&dss_96m_fck,
&dss2_alwon_fck,
&dss_tv_fck,
&dss_96m_fck,
&dss2_alwon_fck,
- &dss_l3_ick,
- &dss_l4_ick,
&cam_mclk,
&cam_l3_ick,
&cam_l4_ick,
&cam_mclk,
&cam_l3_ick,
&cam_l4_ick,