|
| 1 | +media: v4l2-mediabus: Drop V4L2_MBUS_CSI2_CONTINUOUS_CLOCK flag |
| 2 | + |
| 3 | +jira LE-3262 |
| 4 | +Rebuild_History Non-Buildable kernel-5.14.0-570.22.1.el9_6 |
| 5 | +commit-author Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| 6 | +commit b9f7caa7753ad185e0dc7afb3ae4bd423d11f5c0 |
| 7 | +Empty-Commit: Cherry-Pick Conflicts during history rebuild. |
| 8 | +Will be included in final tarball splat. Ref for failed cherry-pick at: |
| 9 | +ciq/ciq_backports/kernel-5.14.0-570.22.1.el9_6/b9f7caa7.failed |
| 10 | + |
| 11 | +MIPI CSI-2 continuous and non-continuous clock modes are mutually |
| 12 | +exclusive. Drop the V4L2_MBUS_CSI2_CONTINUOUS_CLOCK flag and use |
| 13 | +V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK only. |
| 14 | + |
| 15 | + Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| 16 | + Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> |
| 17 | + Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> |
| 18 | +(cherry picked from commit b9f7caa7753ad185e0dc7afb3ae4bd423d11f5c0) |
| 19 | + Signed-off-by: Jonathan Maple <jmaple@ciq.com> |
| 20 | + |
| 21 | +# Conflicts: |
| 22 | +# drivers/media/i2c/adv7180.c |
| 23 | +# drivers/media/i2c/tc358743.c |
| 24 | +diff --cc drivers/media/i2c/adv7180.c |
| 25 | +index 811619651329,4f5db195e66d..000000000000 |
| 26 | +--- a/drivers/media/i2c/adv7180.c |
| 27 | ++++ b/drivers/media/i2c/adv7180.c |
| 28 | +@@@ -768,9 -784,8 +768,14 @@@ static int adv7180_get_mbus_config(stru |
| 29 | + |
| 30 | + if (state->chip_info->flags & ADV7180_FLAG_MIPI_CSI2) { |
| 31 | + cfg->type = V4L2_MBUS_CSI2_DPHY; |
| 32 | +++<<<<<<< HEAD |
| 33 | + + cfg->flags = V4L2_MBUS_CSI2_1_LANE | |
| 34 | + + V4L2_MBUS_CSI2_CHANNEL_0 | |
| 35 | + + V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; |
| 36 | +++======= |
| 37 | ++ cfg->bus.mipi_csi2.num_data_lanes = 1; |
| 38 | ++ cfg->bus.mipi_csi2.flags = 0; |
| 39 | +++>>>>>>> b9f7caa7753a (media: v4l2-mediabus: Drop V4L2_MBUS_CSI2_CONTINUOUS_CLOCK flag) |
| 40 | + } else { |
| 41 | + /* |
| 42 | + * The ADV7180 sensor supports BT.601/656 output modes. |
| 43 | +diff --cc drivers/media/i2c/tc358743.c |
| 44 | +index 3205cd8298dd,e18b8947ad7e..000000000000 |
| 45 | +--- a/drivers/media/i2c/tc358743.c |
| 46 | ++++ b/drivers/media/i2c/tc358743.c |
| 47 | +@@@ -1613,24 -1613,8 +1613,29 @@@ static int tc358743_get_mbus_config(str |
| 48 | + cfg->type = V4L2_MBUS_CSI2_DPHY; |
| 49 | + |
| 50 | + /* Support for non-continuous CSI-2 clock is missing in the driver */ |
| 51 | +++<<<<<<< HEAD |
| 52 | + + cfg->flags = V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; |
| 53 | + + |
| 54 | + + switch (state->csi_lanes_in_use) { |
| 55 | + + case 1: |
| 56 | + + cfg->flags |= V4L2_MBUS_CSI2_1_LANE; |
| 57 | + + break; |
| 58 | + + case 2: |
| 59 | + + cfg->flags |= V4L2_MBUS_CSI2_2_LANE; |
| 60 | + + break; |
| 61 | + + case 3: |
| 62 | + + cfg->flags |= V4L2_MBUS_CSI2_3_LANE; |
| 63 | + + break; |
| 64 | + + case 4: |
| 65 | + + cfg->flags |= V4L2_MBUS_CSI2_4_LANE; |
| 66 | + + break; |
| 67 | + + default: |
| 68 | + + return -EINVAL; |
| 69 | + + } |
| 70 | +++======= |
| 71 | ++ cfg->bus.mipi_csi2.flags = 0; |
| 72 | ++ cfg->bus.mipi_csi2.num_data_lanes = state->csi_lanes_in_use; |
| 73 | +++>>>>>>> b9f7caa7753a (media: v4l2-mediabus: Drop V4L2_MBUS_CSI2_CONTINUOUS_CLOCK flag) |
| 74 | + |
| 75 | + return 0; |
| 76 | + } |
| 77 | +* Unmerged path drivers/media/i2c/adv7180.c |
| 78 | +* Unmerged path drivers/media/i2c/tc358743.c |
| 79 | +diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c |
| 80 | +index 843259c304bb..d531d8053c76 100644 |
| 81 | +--- a/drivers/media/v4l2-core/v4l2-fwnode.c |
| 82 | ++++ b/drivers/media/v4l2-core/v4l2-fwnode.c |
| 83 | +@@ -207,13 +207,11 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode, |
| 84 | + if (fwnode_property_present(fwnode, "clock-noncontinuous")) { |
| 85 | + flags |= V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK; |
| 86 | + pr_debug("non-continuous clock\n"); |
| 87 | +- } else { |
| 88 | +- flags |= V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; |
| 89 | + } |
| 90 | + |
| 91 | + if (bus_type == V4L2_MBUS_CSI2_DPHY || |
| 92 | +- bus_type == V4L2_MBUS_CSI2_CPHY || lanes_used || |
| 93 | +- have_clk_lane || (flags & ~V4L2_MBUS_CSI2_CONTINUOUS_CLOCK)) { |
| 94 | ++ bus_type == V4L2_MBUS_CSI2_CPHY || |
| 95 | ++ lanes_used || have_clk_lane || flags) { |
| 96 | + /* Only D-PHY has a clock lane. */ |
| 97 | + unsigned int dfl_data_lane_index = |
| 98 | + bus_type == V4L2_MBUS_CSI2_DPHY; |
| 99 | +diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h |
| 100 | +index b77871485306..fc30e0a9ca1f 100644 |
| 101 | +--- a/include/media/v4l2-mediabus.h |
| 102 | ++++ b/include/media/v4l2-mediabus.h |
| 103 | +@@ -73,8 +73,7 @@ |
| 104 | + #define V4L2_MBUS_CSI2_CHANNEL_2 BIT(6) |
| 105 | + #define V4L2_MBUS_CSI2_CHANNEL_3 BIT(7) |
| 106 | + /* Clock non-continuous mode support. */ |
| 107 | +-#define V4L2_MBUS_CSI2_CONTINUOUS_CLOCK BIT(8) |
| 108 | +-#define V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK BIT(9) |
| 109 | ++#define V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK BIT(0) |
| 110 | + |
| 111 | + #define V4L2_MBUS_CSI2_CHANNELS (V4L2_MBUS_CSI2_CHANNEL_0 | \ |
| 112 | + V4L2_MBUS_CSI2_CHANNEL_1 | \ |
0 commit comments