diff options
| author | Boris BREZILLON <boris.brezillon@free-electrons.com> | 2014-11-10 12:28:31 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-11-14 14:54:08 -0500 |
| commit | 27ffaeb0ab160852c87e2dfa505594020e9a3a06 (patch) | |
| tree | 2cd571bc21a1e3deedefc762a73a58f755fa3d03 /include/media | |
| parent | 43ba464182cd7f9e8089e3d76af8ef265ff287dd (diff) | |
[media] platform: Make use of media_bus_format enum
In order to have subsytem agnostic media bus format definitions we've
moved media bus definition to include/uapi/linux/media-bus-format.h and
prefixed values with MEDIA_BUS_FMT instead of V4L2_MBUS_FMT.
Reference new definitions in all platform drivers.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/davinci/vpbe.h | 2 | ||||
| -rw-r--r-- | include/media/davinci/vpbe_venc.h | 5 | ||||
| -rw-r--r-- | include/media/exynos-fimc.h | 2 | ||||
| -rw-r--r-- | include/media/soc_camera.h | 2 | ||||
| -rw-r--r-- | include/media/soc_mediabus.h | 6 |
5 files changed, 8 insertions, 9 deletions
diff --git a/include/media/davinci/vpbe.h b/include/media/davinci/vpbe.h index 57585c7004a4..4376beeb28c2 100644 --- a/include/media/davinci/vpbe.h +++ b/include/media/davinci/vpbe.h | |||
| @@ -63,7 +63,7 @@ struct vpbe_output { | |||
| 63 | * output basis. If per mode is needed, we may have to move this to | 63 | * output basis. If per mode is needed, we may have to move this to |
| 64 | * mode_info structure | 64 | * mode_info structure |
| 65 | */ | 65 | */ |
| 66 | enum v4l2_mbus_pixelcode if_params; | 66 | u32 if_params; |
| 67 | }; | 67 | }; |
| 68 | 68 | ||
| 69 | /* encoder configuration info */ | 69 | /* encoder configuration info */ |
diff --git a/include/media/davinci/vpbe_venc.h b/include/media/davinci/vpbe_venc.h index 476fafc2f522..3dbd20026107 100644 --- a/include/media/davinci/vpbe_venc.h +++ b/include/media/davinci/vpbe_venc.h | |||
| @@ -30,11 +30,10 @@ | |||
| 30 | #define VENC_SECOND_FIELD BIT(2) | 30 | #define VENC_SECOND_FIELD BIT(2) |
| 31 | 31 | ||
| 32 | struct venc_platform_data { | 32 | struct venc_platform_data { |
| 33 | int (*setup_pinmux)(enum v4l2_mbus_pixelcode if_type, | 33 | int (*setup_pinmux)(u32 if_type, int field); |
| 34 | int field); | ||
| 35 | int (*setup_clock)(enum vpbe_enc_timings_type type, | 34 | int (*setup_clock)(enum vpbe_enc_timings_type type, |
| 36 | unsigned int pixclock); | 35 | unsigned int pixclock); |
| 37 | int (*setup_if_config)(enum v4l2_mbus_pixelcode pixcode); | 36 | int (*setup_if_config)(u32 pixcode); |
| 38 | /* Number of LCD outputs supported */ | 37 | /* Number of LCD outputs supported */ |
| 39 | int num_lcd_outputs; | 38 | int num_lcd_outputs; |
| 40 | struct vpbe_if_params *lcd_if_params; | 39 | struct vpbe_if_params *lcd_if_params; |
diff --git a/include/media/exynos-fimc.h b/include/media/exynos-fimc.h index aa44660e2041..69bcd2a07d5c 100644 --- a/include/media/exynos-fimc.h +++ b/include/media/exynos-fimc.h | |||
| @@ -101,7 +101,7 @@ struct fimc_source_info { | |||
| 101 | * @flags: flags indicating which operation mode format applies to | 101 | * @flags: flags indicating which operation mode format applies to |
| 102 | */ | 102 | */ |
| 103 | struct fimc_fmt { | 103 | struct fimc_fmt { |
| 104 | enum v4l2_mbus_pixelcode mbus_code; | 104 | u32 mbus_code; |
| 105 | char *name; | 105 | char *name; |
| 106 | u32 fourcc; | 106 | u32 fourcc; |
| 107 | u32 color; | 107 | u32 color; |
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 865246b00127..2f6261f3e570 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h | |||
| @@ -296,7 +296,7 @@ const struct soc_camera_format_xlate *soc_camera_xlate_by_fourcc( | |||
| 296 | * format setup. | 296 | * format setup. |
| 297 | */ | 297 | */ |
| 298 | struct soc_camera_format_xlate { | 298 | struct soc_camera_format_xlate { |
| 299 | enum v4l2_mbus_pixelcode code; | 299 | u32 code; |
| 300 | const struct soc_mbus_pixelfmt *host_fmt; | 300 | const struct soc_mbus_pixelfmt *host_fmt; |
| 301 | }; | 301 | }; |
| 302 | 302 | ||
diff --git a/include/media/soc_mediabus.h b/include/media/soc_mediabus.h index d33f6d059692..2ff773785fb6 100644 --- a/include/media/soc_mediabus.h +++ b/include/media/soc_mediabus.h | |||
| @@ -91,16 +91,16 @@ struct soc_mbus_pixelfmt { | |||
| 91 | * @fmt: pixel format description | 91 | * @fmt: pixel format description |
| 92 | */ | 92 | */ |
| 93 | struct soc_mbus_lookup { | 93 | struct soc_mbus_lookup { |
| 94 | enum v4l2_mbus_pixelcode code; | 94 | u32 code; |
| 95 | struct soc_mbus_pixelfmt fmt; | 95 | struct soc_mbus_pixelfmt fmt; |
| 96 | }; | 96 | }; |
| 97 | 97 | ||
| 98 | const struct soc_mbus_pixelfmt *soc_mbus_find_fmtdesc( | 98 | const struct soc_mbus_pixelfmt *soc_mbus_find_fmtdesc( |
| 99 | enum v4l2_mbus_pixelcode code, | 99 | u32 code, |
| 100 | const struct soc_mbus_lookup *lookup, | 100 | const struct soc_mbus_lookup *lookup, |
| 101 | int n); | 101 | int n); |
| 102 | const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc( | 102 | const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc( |
| 103 | enum v4l2_mbus_pixelcode code); | 103 | u32 code); |
| 104 | s32 soc_mbus_bytes_per_line(u32 width, const struct soc_mbus_pixelfmt *mf); | 104 | s32 soc_mbus_bytes_per_line(u32 width, const struct soc_mbus_pixelfmt *mf); |
| 105 | s32 soc_mbus_image_size(const struct soc_mbus_pixelfmt *mf, | 105 | s32 soc_mbus_image_size(const struct soc_mbus_pixelfmt *mf, |
| 106 | u32 bytes_per_line, u32 height); | 106 | u32 bytes_per_line, u32 height); |
