media: v4l2-mediabus: Drop legacy V4L2_MBUS_CSI2_CHANNEL_* flags

The V4L2_MBUS_CSI2_CHANNEL_* flags are a legacy API. Only
V4L2_MBUS_CSI2_CHANNEL_0 is used, set in a single driver, and never
read. Drop those flags. Virtual channel information should be conveyed
through frame descriptors instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index 286f501..3ff37a5 100644 (file)
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -786,7 +786,6 @@ static int adv7180_get_mbus_config(struct v4l2_subdev *sd,
                cfg->type = V4L2_MBUS_CSI2_DPHY;
                cfg->bus.mipi_csi2.num_data_lanes = 1;
                cfg->bus.mipi_csi2.flags =
-                               V4L2_MBUS_CSI2_CHANNEL_0 |
                                V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
        } else {
                /*

diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index 44195ce..c6626a2 100644 (file)
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -67,20 +67,10 @@
 #define V4L2_MBUS_DATA_ENABLE_LOW              BIT(15)
 
 /* Serial flags */
-/* CSI-2 Virtual Channel identifiers. */
-#define V4L2_MBUS_CSI2_CHANNEL_0               BIT(4)
-#define V4L2_MBUS_CSI2_CHANNEL_1               BIT(5)
-#define V4L2_MBUS_CSI2_CHANNEL_2               BIT(6)
-#define V4L2_MBUS_CSI2_CHANNEL_3               BIT(7)
 /* Clock non-continuous mode support. */
 #define V4L2_MBUS_CSI2_CONTINUOUS_CLOCK                BIT(8)
 #define V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK     BIT(9)
 
-#define V4L2_MBUS_CSI2_CHANNELS                (V4L2_MBUS_CSI2_CHANNEL_0 | \
-                                        V4L2_MBUS_CSI2_CHANNEL_1 | \
-                                        V4L2_MBUS_CSI2_CHANNEL_2 | \
-                                        V4L2_MBUS_CSI2_CHANNEL_3)
-
 #define V4L2_MBUS_CSI2_MAX_DATA_LANES          8
 
 /**