Adding csi2_fck declaration to clock34xx.h

ARM: OMAP: Add CSI2 clock struct for handling it with clock API.

Add CSI2 clock struct for handling it with clock API when TI PM is disabled.

Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
Acked-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 8da009785222954b6ef7bf46e1455ebc33898a34..4d16f56366c26f68702a4cef5ce52bfb360187d0 100644 (file)
--- a/arch/arm/mach-omap2/clock34xx.h
+++ b/arch/arm/mach-omap2/clock34xx.h
@@ -2228,6 +2228,17 @@ static struct clk cam_ick = {
        .recalc         = &followparent_recalc,
 };
 
+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,
+       .clkdm          = { .name = "cam_clkdm" },
+       .recalc         = &followparent_recalc,
+};
+
 /* USBHOST - 3430ES2 only */
 
 static struct clk usbhost_120m_fck = {
@@ -3208,6 +3219,7 @@ static struct clk *onchip_34xx_clks[] __initdata = {
        &dss_ick,
        &cam_mclk,
        &cam_ick,
+       &csi2_96m_fck,
        &usbhost_120m_fck,
        &usbhost_48m_fck,
        &usbhost_ick,

diff --git a/arch/arm/mach-omap2/cm-regbits-34xx.h b/arch/arm/mach-omap2/cm-regbits-34xx.h
index ffb695bfe409578b3691da8e69a049d06b14299e..1b5d1230b80009b4a22814fe7a8a8fbd5704785e 100644 (file)
--- a/arch/arm/mach-omap2/cm-regbits-34xx.h
+++ b/arch/arm/mach-omap2/cm-regbits-34xx.h
@@ -530,6 +530,8 @@
 #define OMAP3430_CLKACTIVITY_DSS_MASK                  (1 << 0)
 
 /* CM_FCLKEN_CAM specific bits */
+#define OMAP3430_EN_CSI2                               (1 << 1)
+#define OMAP3430_EN_CSI2_SHIFT                         1
 
 /* CM_ICLKEN_CAM specific bits */