From: Paul Walmsley <paul@pwsan.com>
Date: Tue, 9 Sep 2008 16:58:02 +0000 (-0600)
Subject: OMAP3 clock: remove extra init from csi2_96m_fck
X-Git-Tag: v2.6.27-omap1~223
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=328e2c6dfe3301018f726ed45371f14000525b11;p=linux-2.6-omap-h63xx.git

OMAP3 clock: remove extra init from csi2_96m_fck

csi2_96m_fck no longer should attempt to init its clockdomain pointer; the
clock framework now does this by default.  Applies on top of the "Update
powerdomains and clockdomains" series sent earlier.

Verified on 3430SDP ES2.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
index 4d16f56366c..674c204a298 100644
--- a/arch/arm/mach-omap2/clock34xx.h
+++ b/arch/arm/mach-omap2/clock34xx.h
@@ -2231,7 +2231,6 @@ static struct clk cam_ick = {
 static struct clk csi2_96m_fck = {
 	.name		= "csi2_96m_fck",
 	.parent		= &core_96m_fck,
-	.init		= &omap2_init_clk_clkdm,
 	.enable_reg	= _OMAP34XX_CM_REGADDR(OMAP3430_CAM_MOD, CM_FCLKEN),
 	.enable_bit	= OMAP3430_EN_CSI2_SHIFT,
 	.flags		= CLOCK_IN_OMAP343X,