| Message ID | 20220123160857.24161-4-laurent.pinchart+renesas@ideasonboard.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 3743d9e434f3a03001691f3c8fa21aaf74170653 |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | media: Centralize MIPI CSI-2 data types in shared header | expand |
Hi Laurent, Thanks for your patch. On 2022-01-23 18:08:54 +0200, Laurent Pinchart wrote: > Replace the hardcoded MIPI CSI-2 data types with macros from > mipi-csi2.h. > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > drivers/media/platform/rcar-isp.c | 32 +++++++++++++++++++++++++------ > 1 file changed, 26 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/platform/rcar-isp.c b/drivers/media/platform/rcar-isp.c > index 2ffab30bc011..10b3474f93a4 100644 > --- a/drivers/media/platform/rcar-isp.c > +++ b/drivers/media/platform/rcar-isp.c > @@ -17,6 +17,7 @@ > #include <linux/pm_runtime.h> > #include <linux/reset.h> > > +#include <media/mipi-csi2.h> > #include <media/v4l2-subdev.h> > > #define ISPINPUTSEL0_REG 0x0008 > @@ -51,12 +52,31 @@ struct rcar_isp_format { > }; > > static const struct rcar_isp_format rcar_isp_formats[] = { > - { .code = MEDIA_BUS_FMT_RGB888_1X24, .datatype = 0x24, .procmode = 0x15 }, > - { .code = MEDIA_BUS_FMT_Y10_1X10, .datatype = 0x2b, .procmode = 0x10 }, > - { .code = MEDIA_BUS_FMT_UYVY8_1X16, .datatype = 0x1e, .procmode = 0x0c }, > - { .code = MEDIA_BUS_FMT_YUYV8_1X16, .datatype = 0x1e, .procmode = 0x0c }, > - { .code = MEDIA_BUS_FMT_UYVY8_2X8, .datatype = 0x1e, .procmode = 0x0c }, > - { .code = MEDIA_BUS_FMT_YUYV10_2X10, .datatype = 0x1e, .procmode = 0x0c }, > + { > + .code = MEDIA_BUS_FMT_RGB888_1X24, > + .datatype = MIPI_CSI2_DT_RGB888, > + .procmode = 0x15 > + }, { > + .code = MEDIA_BUS_FMT_Y10_1X10, > + .datatype = MIPI_CSI2_DT_RAW10, > + .procmode = 0x10, > + }, { > + .code = MEDIA_BUS_FMT_UYVY8_1X16, > + .datatype = MIPI_CSI2_DT_YUV422_8B, > + .procmode = 0x0c, > + }, { > + .code = MEDIA_BUS_FMT_YUYV8_1X16, > + .datatype = MIPI_CSI2_DT_YUV422_8B, > + .procmode = 0x0c, > + }, { > + .code = MEDIA_BUS_FMT_UYVY8_2X8, > + .datatype = MIPI_CSI2_DT_YUV422_8B, > + .procmode = 0x0c, > + }, { > + .code = MEDIA_BUS_FMT_YUYV10_2X10, > + .datatype = MIPI_CSI2_DT_YUV422_8B, > + .procmode = 0x0c, > + }, > }; > > static const struct rcar_isp_format *risp_code_to_fmt(unsigned int code) > -- > Regards, > > Laurent Pinchart >
diff --git a/drivers/media/platform/rcar-isp.c b/drivers/media/platform/rcar-isp.c index 2ffab30bc011..10b3474f93a4 100644 --- a/drivers/media/platform/rcar-isp.c +++ b/drivers/media/platform/rcar-isp.c @@ -17,6 +17,7 @@ #include <linux/pm_runtime.h> #include <linux/reset.h> +#include <media/mipi-csi2.h> #include <media/v4l2-subdev.h> #define ISPINPUTSEL0_REG 0x0008 @@ -51,12 +52,31 @@ struct rcar_isp_format { }; static const struct rcar_isp_format rcar_isp_formats[] = { - { .code = MEDIA_BUS_FMT_RGB888_1X24, .datatype = 0x24, .procmode = 0x15 }, - { .code = MEDIA_BUS_FMT_Y10_1X10, .datatype = 0x2b, .procmode = 0x10 }, - { .code = MEDIA_BUS_FMT_UYVY8_1X16, .datatype = 0x1e, .procmode = 0x0c }, - { .code = MEDIA_BUS_FMT_YUYV8_1X16, .datatype = 0x1e, .procmode = 0x0c }, - { .code = MEDIA_BUS_FMT_UYVY8_2X8, .datatype = 0x1e, .procmode = 0x0c }, - { .code = MEDIA_BUS_FMT_YUYV10_2X10, .datatype = 0x1e, .procmode = 0x0c }, + { + .code = MEDIA_BUS_FMT_RGB888_1X24, + .datatype = MIPI_CSI2_DT_RGB888, + .procmode = 0x15 + }, { + .code = MEDIA_BUS_FMT_Y10_1X10, + .datatype = MIPI_CSI2_DT_RAW10, + .procmode = 0x10, + }, { + .code = MEDIA_BUS_FMT_UYVY8_1X16, + .datatype = MIPI_CSI2_DT_YUV422_8B, + .procmode = 0x0c, + }, { + .code = MEDIA_BUS_FMT_YUYV8_1X16, + .datatype = MIPI_CSI2_DT_YUV422_8B, + .procmode = 0x0c, + }, { + .code = MEDIA_BUS_FMT_UYVY8_2X8, + .datatype = MIPI_CSI2_DT_YUV422_8B, + .procmode = 0x0c, + }, { + .code = MEDIA_BUS_FMT_YUYV10_2X10, + .datatype = MIPI_CSI2_DT_YUV422_8B, + .procmode = 0x0c, + }, }; static const struct rcar_isp_format *risp_code_to_fmt(unsigned int code)
Replace the hardcoded MIPI CSI-2 data types with macros from mipi-csi2.h. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/media/platform/rcar-isp.c | 32 +++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-)