[RESEND][Review Request] Adding csi2_fck declaration to clock34xx.h

[RESEND][Review Request] Adding csi2_fck declaration to clock34xx.h

[Aguirre Rodriguez, Sergio Alberto]

From: Sergio Aguirre <saaguirre@ti.com>

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>
---
 arch/arm/mach-omap2/clock34xx.h       |   12 ++++++++++++
 arch/arm/mach-omap2/cm-regbits-34xx.h |    2 ++
 2 files changed, 14 insertions(+)

Index: linux-omap-2.6/arch/arm/mach-omap2/clock34xx.h
===================================================================
--- linux-omap-2.6.orig/arch/arm/mach-omap2/clock34xx.h	2008-08-21 10:49:20.000000000 -0500
+++ linux-omap-2.6/arch/arm/mach-omap2/clock34xx.h	2008-08-26 11:29:32.000000000 -0500
@@ -2228,6 +2228,17 @@
 	.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 @@
 	&dss_ick,
 	&cam_mclk,
 	&cam_ick,
+	&csi2_96m_fck,
 	&usbhost_120m_fck,
 	&usbhost_48m_fck,
 	&usbhost_ick,
Index: linux-omap-2.6/arch/arm/mach-omap2/cm-regbits-34xx.h
===================================================================
--- linux-omap-2.6.orig/arch/arm/mach-omap2/cm-regbits-34xx.h	2008-08-21 10:49:20.000000000 -0500
+++ linux-omap-2.6/arch/arm/mach-omap2/cm-regbits-34xx.h	2008-08-26 11:29:31.000000000 -0500
@@ -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 */

Re: [RESEND][Review Request] Adding csi2_fck declaration to clock34xx.h

[Felipe Balbi]

On Tue, Sep 02, 2008 at 05:33:55PM -0500, Aguirre Rodriguez, Sergio Alberto wrote:
> +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,
> +};

do not use spaces for identation, I think it's a mailer problem. Try to
use git send-email. Also, clkdm should be initialized as:

	.clkdm		= {
		.name	= "cam_clkdm",
	},

>  /* CM_FCLKEN_CAM specific bits */
> +#define OMAP3430_EN_CSI2				(1 << 1)
> +#define OMAP3430_EN_CSI2_SHIFT				1

align these with the rest of the file

-- 
balbi

RE: [RESEND][Review Request] Adding csi2_fck declaration to clock34xx.h

[Aguirre Rodriguez, Sergio Alberto]

Felipe,

I corrected the indentation as well as the initialization of clkdm, I'll resend the new patch.

About the OMAP3430_EN_CSI2 and OMAP3430_EN_CSI2_SHIFT defines, they look aligned in the final file, although in the patch looks unaligned. That space in the beginning of the patch line seems to be critical to look aligned... :/

Thanks for your time.

Regards,
Sergio

-----Original Message-----
From: Felipe Balbi [mailto:me@felipebalbi.com] 
Sent: Tuesday, September 02, 2008 5:38 PM
To: Aguirre Rodriguez, Sergio Alberto
Cc: Paul Walmsley; linux-omap@vger.kernel.org
Subject: Re: [RESEND][Review Request] Adding csi2_fck declaration to clock34xx.h

On Tue, Sep 02, 2008 at 05:33:55PM -0500, Aguirre Rodriguez, Sergio Alberto wrote:
> +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,
> +};

do not use spaces for identation, I think it's a mailer problem. Try to
use git send-email. Also, clkdm should be initialized as:

	.clkdm		= {
		.name	= "cam_clkdm",
	},

>  /* CM_FCLKEN_CAM specific bits */
> +#define OMAP3430_EN_CSI2				(1 << 1)
> +#define OMAP3430_EN_CSI2_SHIFT				1

align these with the rest of the file

-- 
balbi