Commit 117368f0 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: rockchip: rkisp1: Use mipi-csi2.h 



Replace the driver-specific definitions of MIPI CSI-2 data types with
macros from mipi-csi2.h.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Reviewed-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent f87c445c

drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c

+18 −16
Original line number Diff line number Diff line
@@ -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,

drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h

+0 −11
Original line number Diff line number Diff line
@@ -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)