diff options
Diffstat (limited to 'drivers/media/video/omap3isp/ispccdc.h')
-rw-r--r-- | drivers/media/video/omap3isp/ispccdc.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/media/video/omap3isp/ispccdc.h b/drivers/media/video/omap3isp/ispccdc.h index 6d0264bab75b..890f6b3a68fd 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, |
@@ -147,6 +139,7 @@ struct ispccdc_lsc { | |||
147 | * @subdev: V4L2 subdevice | 139 | * @subdev: V4L2 subdevice |
148 | * @pads: Sink and source media entity pads | 140 | * @pads: Sink and source media entity pads |
149 | * @formats: Active video formats | 141 | * @formats: Active video formats |
142 | * @crop: Active crop rectangle on the OF source pad | ||
150 | * @input: Active input | 143 | * @input: Active input |
151 | * @output: Active outputs | 144 | * @output: Active outputs |
152 | * @video_out: Output video node | 145 | * @video_out: Output video node |
@@ -161,7 +154,6 @@ struct ispccdc_lsc { | |||
161 | * @update: Bitmask of controls to update during the next interrupt | 154 | * @update: Bitmask of controls to update during the next interrupt |
162 | * @shadow_update: Controls update in progress by userspace | 155 | * @shadow_update: Controls update in progress by userspace |
163 | * @syncif: Interface synchronization configuration | 156 | * @syncif: Interface synchronization configuration |
164 | * @vpcfg: Video port configuration | ||
165 | * @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 |
166 | * @state: Streaming state | 158 | * @state: Streaming state |
167 | * @lock: Serializes shadow_update with interrupt handler | 159 | * @lock: Serializes shadow_update with interrupt handler |
@@ -173,6 +165,7 @@ struct isp_ccdc_device { | |||
173 | struct v4l2_subdev subdev; | 165 | struct v4l2_subdev subdev; |
174 | struct media_pad pads[CCDC_PADS_NUM]; | 166 | struct media_pad pads[CCDC_PADS_NUM]; |
175 | struct v4l2_mbus_framefmt formats[CCDC_PADS_NUM]; | 167 | struct v4l2_mbus_framefmt formats[CCDC_PADS_NUM]; |
168 | struct v4l2_rect crop; | ||
176 | 169 | ||
177 | enum ccdc_input_entity input; | 170 | enum ccdc_input_entity input; |
178 | unsigned int output; | 171 | unsigned int output; |
@@ -190,7 +183,6 @@ struct isp_ccdc_device { | |||
190 | unsigned int shadow_update; | 183 | unsigned int shadow_update; |
191 | 184 | ||
192 | struct ispccdc_syncif syncif; | 185 | struct ispccdc_syncif syncif; |
193 | struct ispccdc_vp vpcfg; | ||
194 | 186 | ||
195 | unsigned int underrun:1; | 187 | unsigned int underrun:1; |
196 | enum isp_pipeline_stream_state state; | 188 | enum isp_pipeline_stream_state state; |