luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] omap3isp: Use isp xclk defines

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

Signed-off-by: Stanimir Varbanov <svarbanov@mm-sol.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Stanimir Varbanov 2011-03-21 12:22:44 -03:00 committed by Mauro Carvalho Chehab
parent 994d5375a2
commit 7c2c8f42a3
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/video/omap3isp/isp.c
View File

@ -215,20 +215,21 @@ static u32 isp_set_xclk(struct isp_device *isp, u32 xclk, u8 xclksel)
} }
switch (xclksel) { switch (xclksel) {
case 0: case ISP_XCLK_A:
isp_reg_clr_set(isp, OMAP3_ISP_IOMEM_MAIN, ISP_TCTRL_CTRL, isp_reg_clr_set(isp, OMAP3_ISP_IOMEM_MAIN, ISP_TCTRL_CTRL,
ISPTCTRL_CTRL_DIVA_MASK, ISPTCTRL_CTRL_DIVA_MASK,
divisor << ISPTCTRL_CTRL_DIVA_SHIFT); divisor << ISPTCTRL_CTRL_DIVA_SHIFT);
dev_dbg(isp->dev, "isp_set_xclk(): cam_xclka set to %d Hz\n", dev_dbg(isp->dev, "isp_set_xclk(): cam_xclka set to %d Hz\n",
currentxclk); currentxclk);
break; break;
case 1: case ISP_XCLK_B:
isp_reg_clr_set(isp, OMAP3_ISP_IOMEM_MAIN, ISP_TCTRL_CTRL, isp_reg_clr_set(isp, OMAP3_ISP_IOMEM_MAIN, ISP_TCTRL_CTRL,
ISPTCTRL_CTRL_DIVB_MASK, ISPTCTRL_CTRL_DIVB_MASK,
divisor << ISPTCTRL_CTRL_DIVB_SHIFT); divisor << ISPTCTRL_CTRL_DIVB_SHIFT);
dev_dbg(isp->dev, "isp_set_xclk(): cam_xclkb set to %d Hz\n", dev_dbg(isp->dev, "isp_set_xclk(): cam_xclkb set to %d Hz\n",
currentxclk); currentxclk);
break; break;
case ISP_XCLK_NONE:
default: default:
omap3isp_put(isp); omap3isp_put(isp);
dev_dbg(isp->dev, "ISP_ERR: isp_set_xclk(): Invalid requested " 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? */ /* 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); omap3isp_get(isp);
/* Stopping the clock. */ /* 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); omap3isp_put(isp);
isp->xclk_divisor[xclksel] = divisor; isp->xclk_divisor[xclksel - 1] = divisor;
omap3isp_put(isp); omap3isp_put(isp);

6
drivers/media/video/omap3isp/isp.h
View File

@ -314,9 +314,9 @@ void omap3isp_configure_bridge(struct isp_device *isp,
enum ccdc_input_entity input, enum ccdc_input_entity input,
const struct isp_parallel_platform_data *pdata); const struct isp_parallel_platform_data *pdata);
#define ISP_XCLK_NONE -1 #define ISP_XCLK_NONE 0
#define ISP_XCLK_A 0 #define ISP_XCLK_A 1
#define ISP_XCLK_B 1 #define ISP_XCLK_B 2
struct isp_device *omap3isp_get(struct isp_device *isp); struct isp_device *omap3isp_get(struct isp_device *isp);
void omap3isp_put(struct isp_device *isp); void omap3isp_put(struct isp_device *isp);