Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c8fe0b9 authored by Sergio Aguirre's avatar Sergio Aguirre Committed by Russell King
Browse files

[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.

linux-omap source commit is 8b20f4498928459276bd3366e3381ad595d23432.

Signed-off-by: default avatarSergio Aguirre <saaguirre@ti.com>
Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 712d7c86

arch/arm/mach-omap2/clock34xx.c

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ static struct omap_clk omap34xx_clks[] = { 
	CLK(NULL,	"dss_ick",	&dss_ick,	CK_343X),

	CLK(NULL,	"cam_mclk",	&cam_mclk,	CK_343X),

	CLK(NULL,	"cam_ick",	&cam_ick,	CK_343X),

	CLK(NULL,	"csi2_96m_fck",	&csi2_96m_fck,	CK_343X),

	CLK(NULL,	"usbhost_120m_fck", &usbhost_120m_fck, CK_3430ES2),

	CLK(NULL,	"usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2),

	CLK(NULL,	"usbhost_ick",	&usbhost_ick,	CK_3430ES2),

arch/arm/mach-omap2/clock34xx.h

+11 −0
Original line number Diff line number Diff line
@@ -2198,6 +2198,17 @@ static struct clk cam_ick = { 
	.recalc		= &followparent_recalc,

};



static struct clk csi2_96m_fck = {

	.name		= "csi2_96m_fck",

	.ops		= &clkops_omap2_dflt_wait,

	.parent		= &core_96m_fck,

	.init		= &omap2_init_clk_clkdm,

	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_CAM_MOD, CM_FCLKEN),

	.enable_bit	= OMAP3430_EN_CSI2_SHIFT,

	.clkdm_name	= "cam_clkdm",

	.recalc		= &followparent_recalc,

};



/* USBHOST - 3430ES2 only */



static struct clk usbhost_120m_fck = {

arch/arm/mach-omap2/cm-regbits-34xx.h

+2 −0
Original line number Diff line number Diff line
@@ -524,6 +524,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 */