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

Commit 7c2c8f42 authored by Stanimir Varbanov's avatar Stanimir Varbanov Committed by Mauro Carvalho Chehab
Browse files

[media] omap3isp: Use isp xclk defines 



Use isp defines for isp xclk selection in isp_set_xclk().

Signed-off-by: default avatarStanimir Varbanov <svarbanov@mm-sol.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 994d5375

drivers/media/video/omap3isp/isp.c

+6 −5
Original line number Diff line number Diff line
@@ -215,20 +215,21 @@ static u32 isp_set_xclk(struct isp_device *isp, u32 xclk, u8 xclksel) 
	}



	switch (xclksel) {

	case 0:

	case ISP_XCLK_A:

		isp_reg_clr_set(isp, OMAP3_ISP_IOMEM_MAIN, ISP_TCTRL_CTRL,

				ISPTCTRL_CTRL_DIVA_MASK,

				divisor << ISPTCTRL_CTRL_DIVA_SHIFT);

		dev_dbg(isp->dev, "isp_set_xclk(): cam_xclka set to %d Hz\n",

			currentxclk);

		break;

	case 1:

	case ISP_XCLK_B:

		isp_reg_clr_set(isp, OMAP3_ISP_IOMEM_MAIN, ISP_TCTRL_CTRL,

				ISPTCTRL_CTRL_DIVB_MASK,

				divisor << ISPTCTRL_CTRL_DIVB_SHIFT);

		dev_dbg(isp->dev, "isp_set_xclk(): cam_xclkb set to %d Hz\n",

			currentxclk);

		break;

	case ISP_XCLK_NONE:

	default:

		omap3isp_put(isp);

		dev_dbg(isp->dev, "ISP_ERR: isp_set_xclk(): Invalid requested "
@@ -237,13 +238,13 @@ static u32 isp_set_xclk(struct isp_device *isp, u32 xclk, u8 xclksel) 
	}



	/* Do we go from stable whatever to clock? */

	if (divisor >= 2 && isp->xclk_divisor[xclksel] < 2)

	if (divisor >= 2 && isp->xclk_divisor[xclksel - 1] < 2)

		omap3isp_get(isp);

	/* Stopping the clock. */

	else if (divisor < 2 && isp->xclk_divisor[xclksel] >= 2)

	else if (divisor < 2 && isp->xclk_divisor[xclksel - 1] >= 2)

		omap3isp_put(isp);



	isp->xclk_divisor[xclksel] = divisor;

	isp->xclk_divisor[xclksel - 1] = divisor;



	omap3isp_put(isp);

drivers/media/video/omap3isp/isp.h

+3 −3
Original line number Diff line number Diff line
@@ -314,9 +314,9 @@ void omap3isp_configure_bridge(struct isp_device *isp, 
			       enum ccdc_input_entity input,

			       const struct isp_parallel_platform_data *pdata);



#define ISP_XCLK_NONE			-1

#define ISP_XCLK_A			0

#define ISP_XCLK_B			1

#define ISP_XCLK_NONE			0

#define ISP_XCLK_A			1

#define ISP_XCLK_B			2



struct isp_device *omap3isp_get(struct isp_device *isp);

void omap3isp_put(struct isp_device *isp);