summaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-6.1/950-0646-media-i2c-imx290-Simplify-imx290_set_data_lanes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/bcm27xx/patches-6.1/950-0646-media-i2c-imx290-Simplify-imx290_set_data_lanes.patch')
-rw-r--r--target/linux/bcm27xx/patches-6.1/950-0646-media-i2c-imx290-Simplify-imx290_set_data_lanes.patch59
1 files changed, 0 insertions, 59 deletions
diff --git a/target/linux/bcm27xx/patches-6.1/950-0646-media-i2c-imx290-Simplify-imx290_set_data_lanes.patch b/target/linux/bcm27xx/patches-6.1/950-0646-media-i2c-imx290-Simplify-imx290_set_data_lanes.patch
deleted file mode 100644
index 369dfeda62..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0646-media-i2c-imx290-Simplify-imx290_set_data_lanes.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 1551a08118c8e468b3afe0dd5ae0cfa47b7518e1 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:53 +0100
-Subject: [PATCH] media: i2c: imx290: Simplify imx290_set_data_lanes()
-
-Upstream commit 76c001287f6a
-
-There's no need to check for an incorrect number of data lanes in
-imx290_set_data_lanes() as the value is validated at probe() time. Drop
-the check.
-
-The PHY_LANE_NUM and CSI_LANE_MODE registers are programmed with a value
-equal to the number of lanes minus one. Compute it instead of handling
-it in the switch/case.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 17 +++++------------
- 1 file changed, 5 insertions(+), 12 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -512,28 +512,21 @@ static int imx290_set_register_array(str
-
- static int imx290_set_data_lanes(struct imx290 *imx290)
- {
-- int ret = 0, laneval, frsel;
-+ int ret = 0;
-+ u32 frsel;
-
- switch (imx290->nlanes) {
- case 2:
-- laneval = 0x01;
-+ default:
- frsel = 0x02;
- break;
- case 4:
-- laneval = 0x03;
- frsel = 0x01;
- break;
-- default:
-- /*
-- * We should never hit this since the data lane count is
-- * validated in probe itself
-- */
-- dev_err(imx290->dev, "Lane configuration not supported\n");
-- return -EINVAL;
- }
-
-- imx290_write(imx290, IMX290_PHY_LANE_NUM, laneval, &ret);
-- imx290_write(imx290, IMX290_CSI_LANE_MODE, laneval, &ret);
-+ imx290_write(imx290, IMX290_PHY_LANE_NUM, imx290->nlanes - 1, &ret);
-+ imx290_write(imx290, IMX290_CSI_LANE_MODE, imx290->nlanes - 1, &ret);
- imx290_write(imx290, IMX290_FR_FDG_SEL, frsel, &ret);
-
- return ret;