From: Kevin Hilman Date: Tue, 11 Dec 2007 17:02:53 +0000 (-0800) Subject: ARM: OMAP3: Use a single clock for both L3 and L4 DSS interface clocks X-Git-Tag: v2.6.24-omap1~93 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=bcc9b7b98976ab60b632e87218be061ac240f33d ARM: OMAP3: Use a single clock for both L3 and L4 DSS interface clocks 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 Acked-by: Paul Walmsley Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index ecb8a6ebb8e..2a34c0c190a 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h @@ -1491,17 +1491,9 @@ static struct clk dss2_alwon_fck = { .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, @@ -2336,8 +2328,7 @@ static struct clk *onchip_34xx_clks[] __initdata = { &dss_tv_fck, &dss_96m_fck, &dss2_alwon_fck, - &dss_l3_ick, - &dss_l4_ick, + &dss_ick, &cam_mclk, &cam_l3_ick, &cam_l4_ick,