diff options
author | Sakari Ailus <sakari.ailus@iki.fi> | 2012-02-25 19:13:41 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-14 07:52:38 -0400 |
commit | c6c01f97b1733ba110993ec51600c06961e41bfe (patch) | |
tree | a1dac509e0d763c586998611a6e59e43a8395f35 /drivers/media/video/omap3isp/ispccdc.h | |
parent | ccddd916dcde141a6fb5612da622a8ae060c12b8 (diff) |
[media] omap3isp: Use external rate instead of vpcfg
Access pipe->external_rate instead of isp_ccdc.vpcfg.pixelclk. Also remove
means to set the value for isp_ccdc_vpcfg.pixelclk.
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/omap3isp/ispccdc.h')
-rw-r--r-- | drivers/media/video/omap3isp/ispccdc.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/media/video/omap3isp/ispccdc.h b/drivers/media/video/omap3isp/ispccdc.h index 966bbf8a126..890f6b3a68f 100644 --- a/drivers/media/video/omap3isp/ispccdc.h +++ b/drivers/media/video/omap3isp/ispccdc.h | |||
@@ -80,14 +80,6 @@ struct ispccdc_syncif { | |||
80 | u8 bt_r656_en; | 80 | u8 bt_r656_en; |
81 | }; | 81 | }; |
82 | 82 | ||
83 | /* | ||
84 | * struct ispccdc_vp - Structure for Video Port parameters | ||
85 | * @pixelclk: Input pixel clock in Hz | ||
86 | */ | ||
87 | struct ispccdc_vp { | ||
88 | unsigned int pixelclk; | ||
89 | }; | ||
90 | |||
91 | enum ispccdc_lsc_state { | 83 | enum ispccdc_lsc_state { |
92 | LSC_STATE_STOPPED = 0, | 84 | LSC_STATE_STOPPED = 0, |
93 | LSC_STATE_STOPPING = 1, | 85 | LSC_STATE_STOPPING = 1, |
@@ -162,7 +154,6 @@ struct ispccdc_lsc { | |||
162 | * @update: Bitmask of controls to update during the next interrupt | 154 | * @update: Bitmask of controls to update during the next interrupt |
163 | * @shadow_update: Controls update in progress by userspace | 155 | * @shadow_update: Controls update in progress by userspace |
164 | * @syncif: Interface synchronization configuration | 156 | * @syncif: Interface synchronization configuration |
165 | * @vpcfg: Video port configuration | ||
166 | * @underrun: A buffer underrun occurred and a new buffer has been queued | 157 | * @underrun: A buffer underrun occurred and a new buffer has been queued |
167 | * @state: Streaming state | 158 | * @state: Streaming state |
168 | * @lock: Serializes shadow_update with interrupt handler | 159 | * @lock: Serializes shadow_update with interrupt handler |
@@ -192,7 +183,6 @@ struct isp_ccdc_device { | |||
192 | unsigned int shadow_update; | 183 | unsigned int shadow_update; |
193 | 184 | ||
194 | struct ispccdc_syncif syncif; | 185 | struct ispccdc_syncif syncif; |
195 | struct ispccdc_vp vpcfg; | ||
196 | 186 | ||
197 | unsigned int underrun:1; | 187 | unsigned int underrun:1; |
198 | enum isp_pipeline_stream_state state; | 188 | enum isp_pipeline_stream_state state; |