aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4/950-0822-media-i2c-imx290-Add-support-for-test-pattern-genera.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0822-media-i2c-imx290-Add-support-for-test-pattern-genera.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0822-media-i2c-imx290-Add-support-for-test-pattern-genera.patch110
1 files changed, 0 insertions, 110 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0822-media-i2c-imx290-Add-support-for-test-pattern-genera.patch b/target/linux/bcm27xx/patches-5.4/950-0822-media-i2c-imx290-Add-support-for-test-pattern-genera.patch
deleted file mode 100644
index e7900ab800..0000000000
--- a/target/linux/bcm27xx/patches-5.4/950-0822-media-i2c-imx290-Add-support-for-test-pattern-genera.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From f1a8ae8064a65846489386fe95790900fb150242 Mon Sep 17 00:00:00 2001
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Date: Fri, 12 Jun 2020 15:53:51 +0200
-Subject: [PATCH] media: i2c: imx290: Add support for test pattern
- generation
-
-Commit a58df1f9e4885eaf3d0663574a217e513821a9f0 upstream.
-
-Add support for generating following test patterns by IMX290:
-
-* Sequence Pattern 1
-* Horizontal Color-bar Chart
-* Vertical Color-bar Chart
-* Sequence Pattern 2
-* Gradation Pattern 1
-* Gradation Pattern 2
-* 000/555h Toggle Pattern
-
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
----
- drivers/media/i2c/imx290.c | 41 +++++++++++++++++++++++++++++++++++++-
- 1 file changed, 40 insertions(+), 1 deletion(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -26,12 +26,19 @@
- #define IMX290_REGHOLD 0x3001
- #define IMX290_XMSTA 0x3002
- #define IMX290_FR_FDG_SEL 0x3009
-+#define IMX290_BLKLEVEL_LOW 0x300a
-+#define IMX290_BLKLEVEL_HIGH 0x300b
- #define IMX290_GAIN 0x3014
- #define IMX290_HMAX_LOW 0x301c
- #define IMX290_HMAX_HIGH 0x301d
-+#define IMX290_PGCTRL 0x308c
- #define IMX290_PHY_LANE_NUM 0x3407
- #define IMX290_CSI_LANE_MODE 0x3443
-
-+#define IMX290_PGCTRL_REGEN BIT(0)
-+#define IMX290_PGCTRL_THRU BIT(1)
-+#define IMX290_PGCTRL_MODE(n) ((n) << 4)
-+
- static const char * const imx290_supply_name[] = {
- "vdda",
- "vddd",
-@@ -91,6 +98,17 @@ static const struct regmap_config imx290
- .cache_type = REGCACHE_RBTREE,
- };
-
-+static const char * const imx290_test_pattern_menu[] = {
-+ "Disabled",
-+ "Sequence Pattern 1",
-+ "Horizontal Color-bar Chart",
-+ "Vertical Color-bar Chart",
-+ "Sequence Pattern 2",
-+ "Gradation Pattern 1",
-+ "Gradation Pattern 2",
-+ "000/555h Toggle Pattern",
-+};
-+
- static const struct imx290_regval imx290_global_init_settings[] = {
- { 0x3007, 0x00 },
- { 0x3018, 0x65 },
-@@ -448,6 +466,22 @@ static int imx290_set_ctrl(struct v4l2_c
- case V4L2_CID_GAIN:
- ret = imx290_set_gain(imx290, ctrl->val);
- break;
-+ case V4L2_CID_TEST_PATTERN:
-+ if (ctrl->val) {
-+ imx290_write_reg(imx290, IMX290_BLKLEVEL_LOW, 0x00);
-+ imx290_write_reg(imx290, IMX290_BLKLEVEL_HIGH, 0x00);
-+ msleep(10);
-+ imx290_write_reg(imx290, IMX290_PGCTRL,
-+ (u8)(IMX290_PGCTRL_REGEN |
-+ IMX290_PGCTRL_THRU |
-+ IMX290_PGCTRL_MODE(ctrl->val)));
-+ } else {
-+ imx290_write_reg(imx290, IMX290_PGCTRL, 0x00);
-+ msleep(10);
-+ imx290_write_reg(imx290, IMX290_BLKLEVEL_LOW, 0x3c);
-+ imx290_write_reg(imx290, IMX290_BLKLEVEL_HIGH, 0x00);
-+ }
-+ break;
- default:
- ret = -EINVAL;
- break;
-@@ -959,7 +993,7 @@ static int imx290_probe(struct i2c_clien
- */
- imx290_entity_init_cfg(&imx290->sd, NULL);
-
-- v4l2_ctrl_handler_init(&imx290->ctrls, 3);
-+ v4l2_ctrl_handler_init(&imx290->ctrls, 4);
-
- v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
- V4L2_CID_GAIN, 0, 72, 1, 0);
-@@ -977,6 +1011,11 @@ static int imx290_probe(struct i2c_clien
- 1, INT_MAX, 1,
- imx290_calc_pixel_rate(imx290));
-
-+ v4l2_ctrl_new_std_menu_items(&imx290->ctrls, &imx290_ctrl_ops,
-+ V4L2_CID_TEST_PATTERN,
-+ ARRAY_SIZE(imx290_test_pattern_menu) - 1,
-+ 0, 0, imx290_test_pattern_menu);
-+
- imx290->sd.ctrl_handler = &imx290->ctrls;
-
- if (imx290->ctrls.error) {