diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 09:57:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 09:57:04 -0700 |
| commit | a49fe6d59aae7f7835288df508b709ed2d69cbab (patch) | |
| tree | 4d626942532a30a4fcf1ca26cc38f091de78c218 /include/media | |
| parent | Merge branch 'ipc-scalability' (diff) | |
| parent | [media] omap3isp: Use the common clock framework (diff) | |
| download | linux-dev-a49fe6d59aae7f7835288df508b709ed2d69cbab.tar.xz linux-dev-a49fe6d59aae7f7835288df508b709ed2d69cbab.zip | |
Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull omap3isp clk support from Mauro Carvalho Chehab:
"This patch were sent in separate as it depends on a merge from clock
framework, that you merged in commit 362ed48dee50"
* 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] omap3isp: Use the common clock framework
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/omap3isp.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/media/omap3isp.h b/include/media/omap3isp.h index 95842696857f..c9d06d9f7e6e 100644 --- a/include/media/omap3isp.h +++ b/include/media/omap3isp.h @@ -29,10 +29,6 @@ struct i2c_board_info; struct isp_device; -#define ISP_XCLK_NONE 0 -#define ISP_XCLK_A 1 -#define ISP_XCLK_B 2 - enum isp_interface_type { ISP_INTERFACE_PARALLEL, ISP_INTERFACE_CSI2A_PHY2, @@ -153,7 +149,13 @@ struct isp_v4l2_subdevs_group { } bus; /* gcc < 4.6.0 chokes on anonymous union initializers */ }; +struct isp_platform_xclk { + const char *dev_id; + const char *con_id; +}; + struct isp_platform_data { + struct isp_platform_xclk xclks[2]; struct isp_v4l2_subdevs_group *subdevs; void (*set_constraints)(struct isp_device *isp, bool enable); }; |