diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 12:57:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 12:57:04 -0400 |
| commit | a49fe6d59aae7f7835288df508b709ed2d69cbab (patch) | |
| tree | 4d626942532a30a4fcf1ca26cc38f091de78c218 /include/media | |
| parent | 823e75f723aa3fefd5d2eecbf8636184ca4790fc (diff) | |
| parent | 9b28ee3c9122cea62f2db02f5bb1e1606bb343a6 (diff) | |
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 @@ | |||
| 29 | struct i2c_board_info; | 29 | struct i2c_board_info; |
| 30 | struct isp_device; | 30 | struct isp_device; |
| 31 | 31 | ||
| 32 | #define ISP_XCLK_NONE 0 | ||
| 33 | #define ISP_XCLK_A 1 | ||
| 34 | #define ISP_XCLK_B 2 | ||
| 35 | |||
| 36 | enum isp_interface_type { | 32 | enum isp_interface_type { |
| 37 | ISP_INTERFACE_PARALLEL, | 33 | ISP_INTERFACE_PARALLEL, |
| 38 | ISP_INTERFACE_CSI2A_PHY2, | 34 | ISP_INTERFACE_CSI2A_PHY2, |
| @@ -153,7 +149,13 @@ struct isp_v4l2_subdevs_group { | |||
| 153 | } bus; /* gcc < 4.6.0 chokes on anonymous union initializers */ | 149 | } bus; /* gcc < 4.6.0 chokes on anonymous union initializers */ |
| 154 | }; | 150 | }; |
| 155 | 151 | ||
| 152 | struct isp_platform_xclk { | ||
| 153 | const char *dev_id; | ||
| 154 | const char *con_id; | ||
| 155 | }; | ||
| 156 | |||
| 156 | struct isp_platform_data { | 157 | struct isp_platform_data { |
| 158 | struct isp_platform_xclk xclks[2]; | ||
| 157 | struct isp_v4l2_subdevs_group *subdevs; | 159 | struct isp_v4l2_subdevs_group *subdevs; |
| 158 | void (*set_constraints)(struct isp_device *isp, bool enable); | 160 | void (*set_constraints)(struct isp_device *isp, bool enable); |
| 159 | }; | 161 | }; |