Commit 6c5dbb40 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] omap: omap24xxcam: use short connection IDs for omap2 clocks 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent eeec7c8d

arch/arm/mach-omap2/clock24xx.c

+2 −2
Original line number Diff line number Diff line
@@ -169,8 +169,8 @@ static struct omap_clk omap24xx_clks[] = { 
	CLK(NULL,	"wdt1_ick",	&wdt1_ick,	CK_243X | CK_242X),

	CLK(NULL,	"omapctrl_ick",	&omapctrl_ick,	CK_243X | CK_242X),

	CLK(NULL,	"icr_ick",	&icr_ick,	CK_243X),

	CLK(NULL,	"cam_fck",	&cam_fck,	CK_243X | CK_242X),

	CLK(NULL,	"cam_ick",	&cam_ick,	CK_243X | CK_242X),

	CLK("omap24xxcam", "fck",	&cam_fck,	CK_243X | CK_242X),

	CLK("omap24xxcam", "ick",	&cam_ick,	CK_243X | CK_242X),

	CLK(NULL,	"mailboxes_ick", &mailboxes_ick,	CK_243X | CK_242X),

	CLK(NULL,	"wdt4_ick",	&wdt4_ick,	CK_243X | CK_242X),

	CLK(NULL,	"wdt4_fck",	&wdt4_fck,	CK_243X | CK_242X),

drivers/media/video/omap24xxcam.c

+4 −4
Original line number Diff line number Diff line
@@ -80,17 +80,17 @@ static int omap24xxcam_clock_get(struct omap24xxcam_device *cam) 
{

	int rval = 0;



	cam->fck = clk_get(cam->dev, "cam_fck");

	cam->fck = clk_get(cam->dev, "fck");

	if (IS_ERR(cam->fck)) {

		dev_err(cam->dev, "can't get cam_fck");

		dev_err(cam->dev, "can't get camera fck");

		rval = PTR_ERR(cam->fck);

		omap24xxcam_clock_put(cam);

		return rval;

	}



	cam->ick = clk_get(cam->dev, "cam_ick");

	cam->ick = clk_get(cam->dev, "ick");

	if (IS_ERR(cam->ick)) {

		dev_err(cam->dev, "can't get cam_ick");

		dev_err(cam->dev, "can't get camera ick");

		rval = PTR_ERR(cam->ick);

		omap24xxcam_clock_put(cam);

	}