| Message ID | 20220123160857.24161-6-laurent.pinchart+renesas@ideasonboard.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 117368f0c4773d19d496335d8f5bd54f75348954 |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | media: Centralize MIPI CSI-2 data types in shared header | expand |
Tested on rock-pi4 with few libcamera's 'cam' commands on several pixelformats Tested-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> Reviewed-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> On 23.01.2022 18:08, Laurent Pinchart wrote: > Replace the driver-specific definitions of MIPI CSI-2 data types with > macros from mipi-csi2.h. > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > .../platform/rockchip/rkisp1/rkisp1-isp.c | 34 ++++++++++--------- > .../platform/rockchip/rkisp1/rkisp1-regs.h | 11 ------ > 2 files changed, 18 insertions(+), 27 deletions(-) > > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c > index 2a35bf24e54e..4415c7248c2f 100644 > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c > @@ -14,6 +14,8 @@ > #include <linux/pm_runtime.h> > #include <linux/videodev2.h> > #include <linux/vmalloc.h> > + > +#include <media/mipi-csi2.h> > #include <media/v4l2-event.h> > > #include "rkisp1-common.h" > @@ -62,112 +64,112 @@ static const struct rkisp1_isp_mbus_info rkisp1_isp_formats[] = { > }, { > .mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, > + .mipi_dt = MIPI_CSI2_DT_RAW10, > .bayer_pat = RKISP1_RAW_RGGB, > .bus_width = 10, > .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, > + .mipi_dt = MIPI_CSI2_DT_RAW10, > .bayer_pat = RKISP1_RAW_BGGR, > .bus_width = 10, > .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SGBRG10_1X10, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, > + .mipi_dt = MIPI_CSI2_DT_RAW10, > .bayer_pat = RKISP1_RAW_GBRG, > .bus_width = 10, > .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SGRBG10_1X10, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, > + .mipi_dt = MIPI_CSI2_DT_RAW10, > .bayer_pat = RKISP1_RAW_GRBG, > .bus_width = 10, > .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SRGGB12_1X12, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, > + .mipi_dt = MIPI_CSI2_DT_RAW12, > .bayer_pat = RKISP1_RAW_RGGB, > .bus_width = 12, > .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SBGGR12_1X12, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, > + .mipi_dt = MIPI_CSI2_DT_RAW12, > .bayer_pat = RKISP1_RAW_BGGR, > .bus_width = 12, > .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SGBRG12_1X12, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, > + .mipi_dt = MIPI_CSI2_DT_RAW12, > .bayer_pat = RKISP1_RAW_GBRG, > .bus_width = 12, > .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SGRBG12_1X12, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, > + .mipi_dt = MIPI_CSI2_DT_RAW12, > .bayer_pat = RKISP1_RAW_GRBG, > .bus_width = 12, > .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SRGGB8_1X8, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, > + .mipi_dt = MIPI_CSI2_DT_RAW8, > .bayer_pat = RKISP1_RAW_RGGB, > .bus_width = 8, > .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, > + .mipi_dt = MIPI_CSI2_DT_RAW8, > .bayer_pat = RKISP1_RAW_BGGR, > .bus_width = 8, > .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SGBRG8_1X8, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, > + .mipi_dt = MIPI_CSI2_DT_RAW8, > .bayer_pat = RKISP1_RAW_GBRG, > .bus_width = 8, > .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_SGRBG8_1X8, > .pixel_enc = V4L2_PIXEL_ENC_BAYER, > - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, > + .mipi_dt = MIPI_CSI2_DT_RAW8, > .bayer_pat = RKISP1_RAW_GRBG, > .bus_width = 8, > .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, > }, { > .mbus_code = MEDIA_BUS_FMT_YUYV8_1X16, > .pixel_enc = V4L2_PIXEL_ENC_YUV, > - .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b, > + .mipi_dt = MIPI_CSI2_DT_YUV422_8B, > .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_YCBYCR, > .bus_width = 16, > .direction = RKISP1_ISP_SD_SINK, > }, { > .mbus_code = MEDIA_BUS_FMT_YVYU8_1X16, > .pixel_enc = V4L2_PIXEL_ENC_YUV, > - .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b, > + .mipi_dt = MIPI_CSI2_DT_YUV422_8B, > .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_YCRYCB, > .bus_width = 16, > .direction = RKISP1_ISP_SD_SINK, > }, { > .mbus_code = MEDIA_BUS_FMT_UYVY8_1X16, > .pixel_enc = V4L2_PIXEL_ENC_YUV, > - .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b, > + .mipi_dt = MIPI_CSI2_DT_YUV422_8B, > .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_CBYCRY, > .bus_width = 16, > .direction = RKISP1_ISP_SD_SINK, > }, { > .mbus_code = MEDIA_BUS_FMT_VYUY8_1X16, > .pixel_enc = V4L2_PIXEL_ENC_YUV, > - .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b, > + .mipi_dt = MIPI_CSI2_DT_YUV422_8B, > .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_CRYCBY, > .bus_width = 16, > .direction = RKISP1_ISP_SD_SINK, > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h > index d326214c7e07..82f8d33d98b3 100644 > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h > @@ -333,17 +333,6 @@ > /* MIPI_DATA_SEL */ > #define RKISP1_CIF_MIPI_DATA_SEL_VC(a) (((a) & 0x3) << 6) > #define RKISP1_CIF_MIPI_DATA_SEL_DT(a) (((a) & 0x3F) << 0) > -/* MIPI DATA_TYPE */ > -#define RKISP1_CIF_CSI2_DT_YUV420_8b 0x18 > -#define RKISP1_CIF_CSI2_DT_YUV420_10b 0x19 > -#define RKISP1_CIF_CSI2_DT_YUV422_8b 0x1E > -#define RKISP1_CIF_CSI2_DT_YUV422_10b 0x1F > -#define RKISP1_CIF_CSI2_DT_RGB565 0x22 > -#define RKISP1_CIF_CSI2_DT_RGB666 0x23 > -#define RKISP1_CIF_CSI2_DT_RGB888 0x24 > -#define RKISP1_CIF_CSI2_DT_RAW8 0x2A > -#define RKISP1_CIF_CSI2_DT_RAW10 0x2B > -#define RKISP1_CIF_CSI2_DT_RAW12 0x2C > > /* MIPI_IMSC, MIPI_RIS, MIPI_MIS, MIPI_ICR, MIPI_ISR */ > #define RKISP1_CIF_MIPI_SYNC_FIFO_OVFLW(a) (((a) & 0xF) << 0) > -- > Regards, > > Laurent Pinchart >
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c index 2a35bf24e54e..4415c7248c2f 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c @@ -14,6 +14,8 @@ #include <linux/pm_runtime.h> #include <linux/videodev2.h> #include <linux/vmalloc.h> + +#include <media/mipi-csi2.h> #include <media/v4l2-event.h> #include "rkisp1-common.h" @@ -62,112 +64,112 @@ static const struct rkisp1_isp_mbus_info rkisp1_isp_formats[] = { }, { .mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10, .pixel_enc = V4L2_PIXEL_ENC_BAYER, - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, + .mipi_dt = MIPI_CSI2_DT_RAW10, .bayer_pat = RKISP1_RAW_RGGB, .bus_width = 10, .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10, .pixel_enc = V4L2_PIXEL_ENC_BAYER, - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, + .mipi_dt = MIPI_CSI2_DT_RAW10, .bayer_pat = RKISP1_RAW_BGGR, .bus_width = 10, .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGBRG10_1X10, .pixel_enc = V4L2_PIXEL_ENC_BAYER, - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, + .mipi_dt = MIPI_CSI2_DT_RAW10, .bayer_pat = RKISP1_RAW_GBRG, .bus_width = 10, .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGRBG10_1X10, .pixel_enc = V4L2_PIXEL_ENC_BAYER, - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10, + .mipi_dt = MIPI_CSI2_DT_RAW10, .bayer_pat = RKISP1_RAW_GRBG, .bus_width = 10, .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SRGGB12_1X12, .pixel_enc = V4L2_PIXEL_ENC_BAYER, - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, + .mipi_dt = MIPI_CSI2_DT_RAW12, .bayer_pat = RKISP1_RAW_RGGB, .bus_width = 12, .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SBGGR12_1X12, .pixel_enc = V4L2_PIXEL_ENC_BAYER, - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, + .mipi_dt = MIPI_CSI2_DT_RAW12, .bayer_pat = RKISP1_RAW_BGGR, .bus_width = 12, .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGBRG12_1X12, .pixel_enc = V4L2_PIXEL_ENC_BAYER, - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, + .mipi_dt = MIPI_CSI2_DT_RAW12, .bayer_pat = RKISP1_RAW_GBRG, .bus_width = 12, .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGRBG12_1X12, .pixel_enc = V4L2_PIXEL_ENC_BAYER, - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12, + .mipi_dt = MIPI_CSI2_DT_RAW12, .bayer_pat = RKISP1_RAW_GRBG, .bus_width = 12, .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SRGGB8_1X8, .pixel_enc = V4L2_PIXEL_ENC_BAYER, - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, + .mipi_dt = MIPI_CSI2_DT_RAW8, .bayer_pat = RKISP1_RAW_RGGB, .bus_width = 8, .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8, .pixel_enc = V4L2_PIXEL_ENC_BAYER, - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, + .mipi_dt = MIPI_CSI2_DT_RAW8, .bayer_pat = RKISP1_RAW_BGGR, .bus_width = 8, .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGBRG8_1X8, .pixel_enc = V4L2_PIXEL_ENC_BAYER, - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, + .mipi_dt = MIPI_CSI2_DT_RAW8, .bayer_pat = RKISP1_RAW_GBRG, .bus_width = 8, .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_SGRBG8_1X8, .pixel_enc = V4L2_PIXEL_ENC_BAYER, - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8, + .mipi_dt = MIPI_CSI2_DT_RAW8, .bayer_pat = RKISP1_RAW_GRBG, .bus_width = 8, .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC, }, { .mbus_code = MEDIA_BUS_FMT_YUYV8_1X16, .pixel_enc = V4L2_PIXEL_ENC_YUV, - .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b, + .mipi_dt = MIPI_CSI2_DT_YUV422_8B, .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_YCBYCR, .bus_width = 16, .direction = RKISP1_ISP_SD_SINK, }, { .mbus_code = MEDIA_BUS_FMT_YVYU8_1X16, .pixel_enc = V4L2_PIXEL_ENC_YUV, - .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b, + .mipi_dt = MIPI_CSI2_DT_YUV422_8B, .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_YCRYCB, .bus_width = 16, .direction = RKISP1_ISP_SD_SINK, }, { .mbus_code = MEDIA_BUS_FMT_UYVY8_1X16, .pixel_enc = V4L2_PIXEL_ENC_YUV, - .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b, + .mipi_dt = MIPI_CSI2_DT_YUV422_8B, .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_CBYCRY, .bus_width = 16, .direction = RKISP1_ISP_SD_SINK, }, { .mbus_code = MEDIA_BUS_FMT_VYUY8_1X16, .pixel_enc = V4L2_PIXEL_ENC_YUV, - .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b, + .mipi_dt = MIPI_CSI2_DT_YUV422_8B, .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_CRYCBY, .bus_width = 16, .direction = RKISP1_ISP_SD_SINK, diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h index d326214c7e07..82f8d33d98b3 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h @@ -333,17 +333,6 @@ /* MIPI_DATA_SEL */ #define RKISP1_CIF_MIPI_DATA_SEL_VC(a) (((a) & 0x3) << 6) #define RKISP1_CIF_MIPI_DATA_SEL_DT(a) (((a) & 0x3F) << 0) -/* MIPI DATA_TYPE */ -#define RKISP1_CIF_CSI2_DT_YUV420_8b 0x18 -#define RKISP1_CIF_CSI2_DT_YUV420_10b 0x19 -#define RKISP1_CIF_CSI2_DT_YUV422_8b 0x1E -#define RKISP1_CIF_CSI2_DT_YUV422_10b 0x1F -#define RKISP1_CIF_CSI2_DT_RGB565 0x22 -#define RKISP1_CIF_CSI2_DT_RGB666 0x23 -#define RKISP1_CIF_CSI2_DT_RGB888 0x24 -#define RKISP1_CIF_CSI2_DT_RAW8 0x2A -#define RKISP1_CIF_CSI2_DT_RAW10 0x2B -#define RKISP1_CIF_CSI2_DT_RAW12 0x2C /* MIPI_IMSC, MIPI_RIS, MIPI_MIS, MIPI_ICR, MIPI_ISR */ #define RKISP1_CIF_MIPI_SYNC_FIFO_OVFLW(a) (((a) & 0xF) << 0)
Replace the driver-specific definitions of MIPI CSI-2 data types with macros from mipi-csi2.h. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- .../platform/rockchip/rkisp1/rkisp1-isp.c | 34 ++++++++++--------- .../platform/rockchip/rkisp1/rkisp1-regs.h | 11 ------ 2 files changed, 18 insertions(+), 27 deletions(-)