Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Stefan Riedmueller <s.riedmueller@phytec.de>
To:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc:     Mauro Carvalho Chehab <mchehab@kernel.org>,
        Sakari Ailus <sakari.ailus@linux.intel.com>,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
        Christian Hemp <c.hemp@phytec.de>,
        Jan Luebbe <jlu@pengutronix.de>,
        Stefan Riedmueller <s.riedmueller@phytec.de>
Subject: [PATCH v2 1/5] media: mt9p031: Add support for 8 bit and 10 bit formats
Date:   Wed, 30 Sep 2020 12:51:29 +0200
Message-Id: <20200930105133.139981-1-s.riedmueller@phytec.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

From: Christian Hemp <c.hemp@phytec.de>

Aside from 12 bit monochrome or color format the sensor implicitly
supports 10 and 8 bit formats as well by simply dropping the
corresponding LSBs.

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
[jlu@pengutronix.de: simplified by dropping v4l2=5Fcolorspace handling]
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
Changes in v2:
 - Use unsigned int for num=5Ffmts and loop variable in find=5Fdatafmt
 - Remove superfluous const qualifier from find=5Fdatafmt
---
 drivers/media/i2c/mt9p031.c | 50 +++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c
index dc23b9ed510a..2e6671ef877c 100644
--- a/drivers/media/i2c/mt9p031.c
+++ b/drivers/media/i2c/mt9p031.c
@@ -116,6 +116,18 @@ enum mt9p031=5Fmodel {
 	MT9P031=5FMODEL=5FMONOCHROME,
 };
=20
+static const u32 mt9p031=5Fcolor=5Ffmts[] =3D {
+	MEDIA=5FBUS=5FFMT=5FSGRBG8=5F1X8,
+	MEDIA=5FBUS=5FFMT=5FSGRBG10=5F1X10,
+	MEDIA=5FBUS=5FFMT=5FSGRBG12=5F1X12,
+};
+
+static const u32 mt9p031=5Fmonochrome=5Ffmts[] =3D {
+	MEDIA=5FBUS=5FFMT=5FY8=5F1X8,
+	MEDIA=5FBUS=5FFMT=5FY10=5F1X10,
+	MEDIA=5FBUS=5FFMT=5FY12=5F1X12,
+};
+
 struct mt9p031 {
 	struct v4l2=5Fsubdev subdev;
 	struct media=5Fpad pad;
@@ -138,6 +150,9 @@ struct mt9p031 {
 	struct v4l2=5Fctrl *blc=5Fauto;
 	struct v4l2=5Fctrl *blc=5Foffset;
=20
+	const u32 *fmts;
+	unsigned int num=5Ffmts;
+
 	/* Registers cache */
 	u16 output=5Fcontrol;
 	u16 mode2;
@@ -148,6 +163,17 @@ static struct mt9p031 *to=5Fmt9p031(struct v4l2=5Fsubd=
ev *sd)
 	return container=5Fof(sd, struct mt9p031, subdev);
 }
=20
+static u32 mt9p031=5Ffind=5Fdatafmt(struct mt9p031 *mt9p031, u32 code)
+{
+	unsigned int i;
+
+	for (i =3D 0; i < mt9p031->num=5Ffmts; i++)
+		if (mt9p031->fmts[i] =3D=3D code)
+			return mt9p031->fmts[i];
+
+	return mt9p031->fmts[mt9p031->num=5Ffmts-1];
+}
+
 static int mt9p031=5Fread(struct i2c=5Fclient *client, u8 reg)
 {
 	return i2c=5Fsmbus=5Fread=5Fword=5Fswapped(client, reg);
@@ -476,10 +502,11 @@ static int mt9p031=5Fenum=5Fmbus=5Fcode(struct v4l2=
=5Fsubdev *subdev,
 {
 	struct mt9p031 *mt9p031 =3D to=5Fmt9p031(subdev);
=20
-	if (code->pad || code->index)
+	if (code->pad || code->index >=3D mt9p031->num=5Ffmts)
 		return -EINVAL;
=20
-	code->code =3D mt9p031->format.code;
+	code->code =3D mt9p031->fmts[code->index];
+
 	return 0;
 }
=20
@@ -573,6 +600,8 @@ static int mt9p031=5Fset=5Fformat(struct v4l2=5Fsubdev =
*subdev,
 	=5F=5Fformat->width =3D =5F=5Fcrop->width / hratio;
 	=5F=5Fformat->height =3D =5F=5Fcrop->height / vratio;
=20
+	=5F=5Fformat->code =3D mt9p031=5Ffind=5Fdatafmt(mt9p031, format->format.c=
ode);
+
 	format->format =3D *=5F=5Fformat;
=20
 	return 0;
@@ -951,10 +980,7 @@ static int mt9p031=5Fopen(struct v4l2=5Fsubdev *subdev=
, struct v4l2=5Fsubdev=5Ffh *fh)
=20
 	format =3D v4l2=5Fsubdev=5Fget=5Ftry=5Fformat(subdev, fh->pad, 0);
=20
-	if (mt9p031->model =3D=3D MT9P031=5FMODEL=5FMONOCHROME)
-		format->code =3D MEDIA=5FBUS=5FFMT=5FY12=5F1X12;
-	else
-		format->code =3D MEDIA=5FBUS=5FFMT=5FSGRBG12=5F1X12;
+	format->code =3D mt9p031=5Ffind=5Fdatafmt(mt9p031, 0);
=20
 	format->width =3D MT9P031=5FWINDOW=5FWIDTH=5FDEF;
 	format->height =3D MT9P031=5FWINDOW=5FHEIGHT=5FDEF;
@@ -1121,10 +1147,14 @@ static int mt9p031=5Fprobe(struct i2c=5Fclient *cli=
ent,
 	mt9p031->crop.left =3D MT9P031=5FCOLUMN=5FSTART=5FDEF;
 	mt9p031->crop.top =3D MT9P031=5FROW=5FSTART=5FDEF;
=20
-	if (mt9p031->model =3D=3D MT9P031=5FMODEL=5FMONOCHROME)
-		mt9p031->format.code =3D MEDIA=5FBUS=5FFMT=5FY12=5F1X12;
-	else
-		mt9p031->format.code =3D MEDIA=5FBUS=5FFMT=5FSGRBG12=5F1X12;
+	if (mt9p031->model =3D=3D MT9P031=5FMODEL=5FMONOCHROME) {
+		mt9p031->fmts =3D mt9p031=5Fmonochrome=5Ffmts;
+		mt9p031->num=5Ffmts =3D ARRAY=5FSIZE(mt9p031=5Fmonochrome=5Ffmts);
+	} else {
+		mt9p031->fmts =3D mt9p031=5Fcolor=5Ffmts;
+		mt9p031->num=5Ffmts =3D ARRAY=5FSIZE(mt9p031=5Fcolor=5Ffmts);
+	}
+	mt9p031->format.code =3D mt9p031=5Ffind=5Fdatafmt(mt9p031, 0);
=20
 	mt9p031->format.width =3D MT9P031=5FWINDOW=5FWIDTH=5FDEF;
 	mt9p031->format.height =3D MT9P031=5FWINDOW=5FHEIGHT=5FDEF;
--=20
2.25.1