diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-05-25 15:35:10 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-11 22:54:34 +0400 |
| commit | be9a1b98f4796532c77babe211a6980e81e47b20 (patch) | |
| tree | 2ea8cc5335ed061cbdb379b8e5567aa236fa3723 /drivers/media/video/omap3isp/isp.c | |
| parent | 2f65f467b410ad7285ee243336c5d16dad01e847 (diff) | |
| download | linux-be9a1b98f4796532c77babe211a6980e81e47b20.tar.xz | |
[media] omap3isp: Don't access ISP_CTRL directly in the statistics modules
Use the existing omap3isp_subclk_enable() and omap3isp_subclk_disable()
functions instead.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/omap3isp/isp.c')
| -rw-r--r-- | drivers/media/video/omap3isp/isp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c index 1c347633e663..2e1f32248f10 100644 --- a/drivers/media/video/omap3isp/isp.c +++ b/drivers/media/video/omap3isp/isp.c @@ -1281,7 +1281,9 @@ static void __isp_subclk_update(struct isp_device *isp) { u32 clk = 0; - if (isp->subclk_resources & OMAP3_ISP_SUBCLK_H3A) + /* AEWB and AF share the same clock. */ + if (isp->subclk_resources & + (OMAP3_ISP_SUBCLK_AEWB | OMAP3_ISP_SUBCLK_AF)) clk |= ISPCTRL_H3A_CLK_EN; if (isp->subclk_resources & OMAP3_ISP_SUBCLK_HIST) |