projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[media] platform: Make use of media_bus_format enum
[deliverable/linux.git]
/
drivers
/
media
/
platform
/
vsp1
/
vsp1_sru.c
diff --git
a/drivers/media/platform/vsp1/vsp1_sru.c
b/drivers/media/platform/vsp1/vsp1_sru.c
index b7d3c8b9f18952fbfc095c89a6c999f6634000f2..1129494c7cfc774541b5fe8d4ec7385e0bcc22de 100644
(file)
--- a/
drivers/media/platform/vsp1/vsp1_sru.c
+++ b/
drivers/media/platform/vsp1/vsp1_sru.c
@@
-139,7
+139,7
@@
static int sru_s_stream(struct v4l2_subdev *subdev, int enable)
input = &sru->entity.formats[SRU_PAD_SINK];
output = &sru->entity.formats[SRU_PAD_SOURCE];
input = &sru->entity.formats[SRU_PAD_SINK];
output = &sru->entity.formats[SRU_PAD_SOURCE];
- if (input->code ==
V4L2_M
BUS_FMT_ARGB8888_1X32)
+ if (input->code ==
MEDIA_
BUS_FMT_ARGB8888_1X32)
ctrl0 = VI6_SRU_CTRL0_PARAM2 | VI6_SRU_CTRL0_PARAM3
| VI6_SRU_CTRL0_PARAM4;
else
ctrl0 = VI6_SRU_CTRL0_PARAM2 | VI6_SRU_CTRL0_PARAM3
| VI6_SRU_CTRL0_PARAM4;
else
@@
-170,8
+170,8
@@
static int sru_enum_mbus_code(struct v4l2_subdev *subdev,
struct v4l2_subdev_mbus_code_enum *code)
{
static const unsigned int codes[] = {
struct v4l2_subdev_mbus_code_enum *code)
{
static const unsigned int codes[] = {
-
V4L2_M
BUS_FMT_ARGB8888_1X32,
-
V4L2_M
BUS_FMT_AYUV8_1X32,
+
MEDIA_
BUS_FMT_ARGB8888_1X32,
+
MEDIA_
BUS_FMT_AYUV8_1X32,
};
struct v4l2_mbus_framefmt *format;
};
struct v4l2_mbus_framefmt *format;
@@
-248,9
+248,9
@@
static void sru_try_format(struct vsp1_sru *sru, struct v4l2_subdev_fh *fh,
switch (pad) {
case SRU_PAD_SINK:
/* Default to YUV if the requested format is not supported. */
switch (pad) {
case SRU_PAD_SINK:
/* Default to YUV if the requested format is not supported. */
- if (fmt->code !=
V4L2_M
BUS_FMT_ARGB8888_1X32 &&
- fmt->code !=
V4L2_M
BUS_FMT_AYUV8_1X32)
- fmt->code =
V4L2_M
BUS_FMT_AYUV8_1X32;
+ if (fmt->code !=
MEDIA_
BUS_FMT_ARGB8888_1X32 &&
+ fmt->code !=
MEDIA_
BUS_FMT_AYUV8_1X32)
+ fmt->code =
MEDIA_
BUS_FMT_AYUV8_1X32;
fmt->width = clamp(fmt->width, SRU_MIN_SIZE, SRU_MAX_SIZE);
fmt->height = clamp(fmt->height, SRU_MIN_SIZE, SRU_MAX_SIZE);
fmt->width = clamp(fmt->width, SRU_MIN_SIZE, SRU_MAX_SIZE);
fmt->height = clamp(fmt->height, SRU_MIN_SIZE, SRU_MAX_SIZE);
This page took
0.029697 seconds
and
5
git commands to generate.