Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f476fb56 authored by Todor Tomov's avatar Todor Tomov Committed by Mauro Carvalho Chehab
Browse files

media: camss: Add support for RAW MIPI14 on 8x96 



Add support for RAW MIPI14 format for RDI mode on 8x96.

Signed-off-by: default avatarTodor Tomov <todor.tomov@linaro.org>
Signed-off-by: default avatarHans Verkuil <hansverk@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 5019d7c8

drivers/media/platform/qcom/camss/camss-csid.c

+30 −0
Original line number Diff line number Diff line
@@ -63,11 +63,13 @@ 
#define DATA_TYPE_RAW_8BIT		0x2a

#define DATA_TYPE_RAW_10BIT		0x2b

#define DATA_TYPE_RAW_12BIT		0x2c

#define DATA_TYPE_RAW_14BIT		0x2d



#define DECODE_FORMAT_UNCOMPRESSED_6_BIT	0x0

#define DECODE_FORMAT_UNCOMPRESSED_8_BIT	0x1

#define DECODE_FORMAT_UNCOMPRESSED_10_BIT	0x2

#define DECODE_FORMAT_UNCOMPRESSED_12_BIT	0x3

#define DECODE_FORMAT_UNCOMPRESSED_14_BIT	0x8



#define CSID_RESET_TIMEOUT_MS 500
@@ -306,6 +308,34 @@ static const struct csid_format csid_formats_8x96[] = { 
		DECODE_FORMAT_UNCOMPRESSED_12_BIT,

		12,

		1,

	},

	{

		MEDIA_BUS_FMT_SBGGR14_1X14,

		DATA_TYPE_RAW_14BIT,

		DECODE_FORMAT_UNCOMPRESSED_14_BIT,

		14,

		1,

	},

	{

		MEDIA_BUS_FMT_SGBRG14_1X14,

		DATA_TYPE_RAW_14BIT,

		DECODE_FORMAT_UNCOMPRESSED_14_BIT,

		14,

		1,

	},

	{

		MEDIA_BUS_FMT_SGRBG14_1X14,

		DATA_TYPE_RAW_14BIT,

		DECODE_FORMAT_UNCOMPRESSED_14_BIT,

		14,

		1,

	},

	{

		MEDIA_BUS_FMT_SRGGB14_1X14,

		DATA_TYPE_RAW_14BIT,

		DECODE_FORMAT_UNCOMPRESSED_14_BIT,

		14,

		1,

	}

};

drivers/media/platform/qcom/camss/camss-csiphy.c

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ static const struct csiphy_format csiphy_formats_8x96[] = { 
	{ MEDIA_BUS_FMT_SGBRG12_1X12, 12 },

	{ MEDIA_BUS_FMT_SGRBG12_1X12, 12 },

	{ MEDIA_BUS_FMT_SRGGB12_1X12, 12 },

	{ MEDIA_BUS_FMT_SBGGR14_1X14, 14 },

	{ MEDIA_BUS_FMT_SGBRG14_1X14, 14 },

	{ MEDIA_BUS_FMT_SGRBG14_1X14, 14 },

	{ MEDIA_BUS_FMT_SRGGB14_1X14, 14 },

};



/*

drivers/media/platform/qcom/camss/camss-ispif.c

+4 −0
Original line number Diff line number Diff line
@@ -140,6 +140,10 @@ static const u32 ispif_formats_8x96[] = { 
	MEDIA_BUS_FMT_SGBRG12_1X12,

	MEDIA_BUS_FMT_SGRBG12_1X12,

	MEDIA_BUS_FMT_SRGGB12_1X12,

	MEDIA_BUS_FMT_SBGGR14_1X14,

	MEDIA_BUS_FMT_SGBRG14_1X14,

	MEDIA_BUS_FMT_SGRBG14_1X14,

	MEDIA_BUS_FMT_SRGGB14_1X14,

};



/*

drivers/media/platform/qcom/camss/camss-vfe.c

+4 −0
Original line number Diff line number Diff line
@@ -94,6 +94,10 @@ static const struct vfe_format formats_rdi_8x96[] = { 
	{ MEDIA_BUS_FMT_SGBRG12_1X12, 12 },

	{ MEDIA_BUS_FMT_SGRBG12_1X12, 12 },

	{ MEDIA_BUS_FMT_SRGGB12_1X12, 12 },

	{ MEDIA_BUS_FMT_SBGGR14_1X14, 14 },

	{ MEDIA_BUS_FMT_SGBRG14_1X14, 14 },

	{ MEDIA_BUS_FMT_SGRBG14_1X14, 14 },

	{ MEDIA_BUS_FMT_SRGGB14_1X14, 14 },

};



static const struct vfe_format formats_pix_8x96[] = {

drivers/media/platform/qcom/camss/camss-video.c

+8 −0
Original line number Diff line number Diff line
@@ -111,6 +111,14 @@ static const struct camss_format_info formats_rdi_8x96[] = { 
	  { { 1, 1 } }, { { 1, 1 } }, { 12 } },

	{ MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12P, 1,

	  { { 1, 1 } }, { { 1, 1 } }, { 12 } },

	{ MEDIA_BUS_FMT_SBGGR14_1X14, V4L2_PIX_FMT_SBGGR14P, 1,

	  { { 1, 1 } }, { { 1, 1 } }, { 14 } },

	{ MEDIA_BUS_FMT_SGBRG14_1X14, V4L2_PIX_FMT_SGBRG14P, 1,

	  { { 1, 1 } }, { { 1, 1 } }, { 14 } },

	{ MEDIA_BUS_FMT_SGRBG14_1X14, V4L2_PIX_FMT_SGRBG14P, 1,

	  { { 1, 1 } }, { { 1, 1 } }, { 14 } },

	{ MEDIA_BUS_FMT_SRGGB14_1X14, V4L2_PIX_FMT_SRGGB14P, 1,

	  { { 1, 1 } }, { { 1, 1 } }, { 14 } },

};



static const struct camss_format_info formats_pix_8x16[] = {