From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> To: mchehab@kernel.org, sakari.ailus@iki.fi Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, c.barrett@framos.com, a.brela@framos.com, peter.griffin@linaro.org, Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Subject: [PATCH 3/5] media: i2c: imx290: Add RAW12 mode support Date: Sat, 30 Nov 2019 00:35:39 +0530 [thread overview] Message-ID: <20191129190541.30315-4-manivannan.sadhasivam@linaro.org> (raw) In-Reply-To: <20191129190541.30315-1-manivannan.sadhasivam@linaro.org> IMX290 is capable of outputting frames in both Raw Bayer (packed) 10 and 12 bit formats. Since the driver already supports RAW10 mode, let's add the missing RAW12 mode as well. Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> --- drivers/media/i2c/imx290.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c index e218c959a729..d5bb3a59ac46 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -75,6 +75,7 @@ struct imx290 { struct clk *xclk; struct regmap *regmap; int nlanes; + u8 bpp; struct v4l2_subdev sd; struct v4l2_fwnode_endpoint ep; @@ -98,6 +99,7 @@ struct imx290_pixfmt { static const struct imx290_pixfmt imx290_formats[] = { { MEDIA_BUS_FMT_SRGGB10_1X10 }, + { MEDIA_BUS_FMT_SRGGB12_1X12 }, }; static const struct regmap_config imx290_regmap_config = { @@ -265,6 +267,18 @@ static const struct imx290_regval imx290_10bit_settings[] = { { 0x300b, 0x00}, }; +static const struct imx290_regval imx290_12bit_settings[] = { + { 0x3005, 0x01 }, + { 0x3046, 0x01 }, + { 0x3129, 0x00 }, + { 0x317c, 0x00 }, + { 0x31ec, 0x0e }, + { 0x3441, 0x0c }, + { 0x3442, 0x0c }, + { 0x300a, 0xf0 }, + { 0x300b, 0x00 }, +}; + /* supported link frequencies */ static const s64 imx290_link_freq[] = { IMX290_DEFAULT_LINK_FREQ, @@ -550,6 +564,21 @@ static int imx290_write_current_format(struct imx290 *imx290, dev_err(imx290->dev, "Could not set format registers\n"); return ret; } + + imx290->bpp = 10; + + break; + case MEDIA_BUS_FMT_SRGGB12_1X12: + ret = imx290_set_register_array(imx290, imx290_12bit_settings, + ARRAY_SIZE( + imx290_12bit_settings)); + if (ret < 0) { + dev_err(imx290->dev, "Could not set format registers\n"); + return ret; + } + + imx290->bpp = 12; + break; default: dev_err(imx290->dev, "Unknown pixel format\n"); @@ -910,6 +939,9 @@ static int imx290_probe(struct i2c_client *client) goto free_err; } + /* Default bits per pixel value */ + imx290->bpp = 10; + mutex_init(&imx290->lock); v4l2_ctrl_handler_init(&imx290->ctrls, 4); -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> To: mchehab@kernel.org, sakari.ailus@iki.fi Cc: devicetree@vger.kernel.org, c.barrett@framos.com, linux-kernel@vger.kernel.org, a.brela@framos.com, peter.griffin@linaro.org, Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Subject: [PATCH 3/5] media: i2c: imx290: Add RAW12 mode support Date: Sat, 30 Nov 2019 00:35:39 +0530 [thread overview] Message-ID: <20191129190541.30315-4-manivannan.sadhasivam@linaro.org> (raw) In-Reply-To: <20191129190541.30315-1-manivannan.sadhasivam@linaro.org> IMX290 is capable of outputting frames in both Raw Bayer (packed) 10 and 12 bit formats. Since the driver already supports RAW10 mode, let's add the missing RAW12 mode as well. Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> --- drivers/media/i2c/imx290.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c index e218c959a729..d5bb3a59ac46 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -75,6 +75,7 @@ struct imx290 { struct clk *xclk; struct regmap *regmap; int nlanes; + u8 bpp; struct v4l2_subdev sd; struct v4l2_fwnode_endpoint ep; @@ -98,6 +99,7 @@ struct imx290_pixfmt { static const struct imx290_pixfmt imx290_formats[] = { { MEDIA_BUS_FMT_SRGGB10_1X10 }, + { MEDIA_BUS_FMT_SRGGB12_1X12 }, }; static const struct regmap_config imx290_regmap_config = { @@ -265,6 +267,18 @@ static const struct imx290_regval imx290_10bit_settings[] = { { 0x300b, 0x00}, }; +static const struct imx290_regval imx290_12bit_settings[] = { + { 0x3005, 0x01 }, + { 0x3046, 0x01 }, + { 0x3129, 0x00 }, + { 0x317c, 0x00 }, + { 0x31ec, 0x0e }, + { 0x3441, 0x0c }, + { 0x3442, 0x0c }, + { 0x300a, 0xf0 }, + { 0x300b, 0x00 }, +}; + /* supported link frequencies */ static const s64 imx290_link_freq[] = { IMX290_DEFAULT_LINK_FREQ, @@ -550,6 +564,21 @@ static int imx290_write_current_format(struct imx290 *imx290, dev_err(imx290->dev, "Could not set format registers\n"); return ret; } + + imx290->bpp = 10; + + break; + case MEDIA_BUS_FMT_SRGGB12_1X12: + ret = imx290_set_register_array(imx290, imx290_12bit_settings, + ARRAY_SIZE( + imx290_12bit_settings)); + if (ret < 0) { + dev_err(imx290->dev, "Could not set format registers\n"); + return ret; + } + + imx290->bpp = 12; + break; default: dev_err(imx290->dev, "Unknown pixel format\n"); @@ -910,6 +939,9 @@ static int imx290_probe(struct i2c_client *client) goto free_err; } + /* Default bits per pixel value */ + imx290->bpp = 10; + mutex_init(&imx290->lock); v4l2_ctrl_handler_init(&imx290->ctrls, 4); -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-11-29 19:06 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-29 19:05 [PATCH 0/5] Improvements to IMX290 CMOS driver Manivannan Sadhasivam 2019-11-29 19:05 ` Manivannan Sadhasivam 2019-11-29 19:05 ` [PATCH 1/5] media: i2c: imx290: Add support for 2 data lanes Manivannan Sadhasivam 2019-11-29 19:05 ` Manivannan Sadhasivam 2019-12-03 8:45 ` Sakari Ailus 2019-12-03 8:45 ` Sakari Ailus 2019-12-15 17:34 ` Manivannan Sadhasivam 2019-12-15 17:34 ` Manivannan Sadhasivam 2019-11-29 19:05 ` [PATCH 2/5] media: i2c: imx290: Add support for test pattern generation Manivannan Sadhasivam 2019-11-29 19:05 ` Manivannan Sadhasivam 2019-12-03 8:48 ` Sakari Ailus 2019-12-03 8:48 ` Sakari Ailus 2019-12-15 17:35 ` Manivannan Sadhasivam 2019-12-15 17:35 ` Manivannan Sadhasivam 2019-11-29 19:05 ` Manivannan Sadhasivam [this message] 2019-11-29 19:05 ` [PATCH 3/5] media: i2c: imx290: Add RAW12 mode support Manivannan Sadhasivam 2019-11-29 19:49 ` Fabio Estevam 2019-11-29 19:49 ` Fabio Estevam 2019-11-30 14:09 ` Manivannan Sadhasivam 2019-11-30 14:09 ` Manivannan Sadhasivam 2019-12-03 8:54 ` Sakari Ailus 2019-12-03 8:54 ` Sakari Ailus 2019-12-15 17:46 ` Manivannan Sadhasivam 2019-12-15 17:46 ` Manivannan Sadhasivam 2019-12-27 15:28 ` Sakari Ailus 2019-12-27 15:28 ` Sakari Ailus 2019-11-29 19:05 ` [PATCH 4/5] media: i2c: imx290: Add support to enumerate all frame sizes Manivannan Sadhasivam 2019-11-29 19:05 ` Manivannan Sadhasivam 2019-12-03 8:56 ` Sakari Ailus 2019-12-03 8:56 ` Sakari Ailus 2019-12-15 17:48 ` Manivannan Sadhasivam 2019-12-15 17:48 ` Manivannan Sadhasivam [not found] ` <CAFP0Ok8Vqze8ZRyT1WvMXZeBLcx7oKcTO1Kad4kSFLbpHkok-A@mail.gmail.com> 2019-12-16 4:04 ` Manivannan Sadhasivam 2019-12-16 4:04 ` Manivannan Sadhasivam 2019-11-29 19:05 ` [PATCH 5/5] media: i2c: imx290: Add configurable link frequency and pixel rate Manivannan Sadhasivam 2019-11-29 19:05 ` Manivannan Sadhasivam
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191129190541.30315-4-manivannan.sadhasivam@linaro.org \ --to=manivannan.sadhasivam@linaro.org \ --cc=a.brela@framos.com \ --cc=c.barrett@framos.com \ --cc=devicetree@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=mchehab@kernel.org \ --cc=peter.griffin@linaro.org \ --cc=sakari.ailus@iki.fi \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.