> Please, re-generate the affected V4L/DVB patches, without the PXA part. I'll

> keep those changes on hold, until I get a confirmation that the PXA side is
> committed on mainstream.
Reverted several changes on soc_camera

From: Mauro Carvalho Chehab <mchehab@infradead.org>

As asked by Guennadi:

Mauro, please, drop commits 2f4a87873f13924871d7bb82e27d02d0e16fbe02 and
9b7d577c508e7765860e599c0e98d4ac3fbaa2aa from your tree and replace
5f1e5244ee6b9f139a262d5e7a930a41488afbbe with the version below.

Due to that change, that happened on v4l-dvb -git tree, several patches broke.

This patch reverts all broken stuff, keeping this tree in sync with v4l-dvb
-git tree.

I'm waiting for Guennadi to fix the broken patches and ask me to pull them
again.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 41 insertions, 60 deletions

diff --git a/linux/drivers/media/video/mt9m001.c b/linux/drivers/media/video/mt9m001.c
index 3fb5f63df..879f61ac4 100644
--- a/linux/drivers/media/video/mt9m001.c
+++ b/linux/drivers/media/video/mt9m001.c
@@ -210,64 +210,40 @@ static int bus_switch_act(struct mt9m001 *mt9m001, int go8bit)
 #endif
 }
 
-static int bus_switch_possible(struct mt9m001 *mt9m001)
-{
-#ifdef CONFIG_MT9M001_PCA9536_SWITCH
-	return gpio_is_valid(mt9m001->switch_gpio);
-#else
-	return 0;
-#endif
-}
-
-static int mt9m001_set_bus_param(struct soc_camera_device *icd,
-				 unsigned long flags)
+static int mt9m001_set_capture_format(struct soc_camera_device *icd,
+		__u32 pixfmt, struct v4l2_rect *rect, unsigned int flags)
 {
 	struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
-	unsigned int width_flag = flags & SOCAM_DATAWIDTH_MASK;
+	unsigned int width_flag = flags & (IS_DATAWIDTH_10 | IS_DATAWIDTH_9 |
+					   IS_DATAWIDTH_8);
 	int ret;
+	const u16 hblank = 9, vblank = 25;
 
-	/* Flags validity verified in test_bus_param */
+	/* MT9M001 has all capture_format parameters fixed */
+	if (!(flags & IS_MASTER) ||
+	    !(flags & IS_PCLK_SAMPLE_RISING) ||
+	    !(flags & IS_HSYNC_ACTIVE_HIGH) ||
+	    !(flags & IS_VSYNC_ACTIVE_HIGH))
+		return -EINVAL;
+
+	/* Only one width bit may be set */
+	if (!is_power_of_2(width_flag))
+		return -EINVAL;
 
-	if ((mt9m001->datawidth != 10 && (width_flag == SOCAM_DATAWIDTH_10)) ||
-	    (mt9m001->datawidth != 9  && (width_flag == SOCAM_DATAWIDTH_9)) ||
-	    (mt9m001->datawidth != 8  && (width_flag == SOCAM_DATAWIDTH_8))) {
+	if ((mt9m001->datawidth != 10 && (width_flag == IS_DATAWIDTH_10)) ||
+	    (mt9m001->datawidth != 9  && (width_flag == IS_DATAWIDTH_9)) ||
+	    (mt9m001->datawidth != 8  && (width_flag == IS_DATAWIDTH_8))) {
 		/* Well, we actually only can do 10 or 8 bits... */
-		if (width_flag == SOCAM_DATAWIDTH_9)
+		if (width_flag == IS_DATAWIDTH_9)
 			return -EINVAL;
 		ret = bus_switch_act(mt9m001,
-				     width_flag == SOCAM_DATAWIDTH_8);
+				     width_flag == IS_DATAWIDTH_8);
 		if (ret < 0)
 			return ret;
 
-		mt9m001->datawidth = width_flag == SOCAM_DATAWIDTH_8 ? 8 : 10;
+		mt9m001->datawidth = width_flag == IS_DATAWIDTH_8 ? 8 : 10;
 	}
 
-	return 0;
-}
-
-static unsigned long mt9m001_query_bus_param(struct soc_camera_device *icd)
-{
-	struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
-	unsigned int width_flag = SOCAM_DATAWIDTH_10;
-
-	if (bus_switch_possible(mt9m001))
-		width_flag |= SOCAM_DATAWIDTH_8;
-
-	/* MT9M001 has all capture_format parameters fixed */
-	return SOCAM_PCLK_SAMPLE_RISING |
-		SOCAM_HSYNC_ACTIVE_HIGH |
-		SOCAM_VSYNC_ACTIVE_HIGH |
-		SOCAM_MASTER |
-		width_flag;
-}
-
-static int mt9m001_set_fmt_cap(struct soc_camera_device *icd,
-		__u32 pixfmt, struct v4l2_rect *rect)
-{
-	struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
-	int ret;
-	const u16 hblank = 9, vblank = 25;
-
 	/* Blanking and start values - default... */
 	ret = reg_write(icd, MT9M001_HORIZONTAL_BLANKING, hblank);
 	if (ret >= 0)
@@ -372,6 +348,12 @@ static int mt9m001_set_register(struct soc_camera_device *icd,
 }
 #endif
 
+static unsigned int mt9m001_get_datawidth(struct soc_camera_device *icd)
+{
+	struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
+	return mt9m001->datawidth;
+}
+
 const struct v4l2_queryctrl mt9m001_controls[] = {
 	{
 		.id		= V4L2_CID_VFLIP,
@@ -410,23 +392,20 @@ const struct v4l2_queryctrl mt9m001_controls[] = {
 	}
 };
 
-static int mt9m001_video_probe(struct soc_camera_device *);
-static void mt9m001_video_remove(struct soc_camera_device *);
-static int mt9m001_get_control(struct soc_camera_device *, struct v4l2_control *);
-static int mt9m001_set_control(struct soc_camera_device *, struct v4l2_control *);
+static int mt9m001_get_control(struct soc_camera_device *icd, struct v4l2_control *ctrl);
+static int mt9m001_set_control(struct soc_camera_device *icd, struct v4l2_control *ctrl);
 
 static struct soc_camera_ops mt9m001_ops = {
 	.owner			= THIS_MODULE,
-	.probe			= mt9m001_video_probe,
-	.remove			= mt9m001_video_remove,
 	.init			= mt9m001_init,
 	.release		= mt9m001_release,
 	.start_capture		= mt9m001_start_capture,
 	.stop_capture		= mt9m001_stop_capture,
-	.set_fmt_cap		= mt9m001_set_fmt_cap,
+	.set_capture_format	= mt9m001_set_capture_format,
 	.try_fmt_cap		= mt9m001_try_fmt_cap,
-	.set_bus_param		= mt9m001_set_bus_param,
-	.query_bus_param	= mt9m001_query_bus_param,
+	.formats		= NULL, /* Filled in later depending on the */
+	.num_formats		= 0,	/* camera type and data widths */
+	.get_datawidth		= mt9m001_get_datawidth,
 	.controls		= mt9m001_controls,
 	.num_controls		= ARRAY_SIZE(mt9m001_controls),
 	.get_control		= mt9m001_get_control,
@@ -575,19 +554,19 @@ static int mt9m001_video_probe(struct soc_camera_device *icd)
 	case 0x8411:
 	case 0x8421:
 		mt9m001->model = V4L2_IDENT_MT9M001C12ST;
-		icd->formats = mt9m001_colour_formats;
+		mt9m001_ops.formats = mt9m001_colour_formats;
 		if (mt9m001->client->dev.platform_data)
-			icd->num_formats = ARRAY_SIZE(mt9m001_colour_formats);
+			mt9m001_ops.num_formats = ARRAY_SIZE(mt9m001_colour_formats);
 		else
-			icd->num_formats = 1;
+			mt9m001_ops.num_formats = 1;
 		break;
 	case 0x8431:
 		mt9m001->model = V4L2_IDENT_MT9M001C12STM;
-		icd->formats = mt9m001_monochrome_formats;
+		mt9m001_ops.formats = mt9m001_monochrome_formats;
 		if (mt9m001->client->dev.platform_data)
-			icd->num_formats = ARRAY_SIZE(mt9m001_monochrome_formats);
+			mt9m001_ops.num_formats = ARRAY_SIZE(mt9m001_monochrome_formats);
 		else
-			icd->num_formats = 1;
+			mt9m001_ops.num_formats = 1;
 		break;
 	default:
 		ret = -ENODEV;
@@ -648,6 +627,8 @@ static int mt9m001_probe(struct i2c_client *client)
 
 	/* Second stage probe - when a capture adapter is there */
 	icd = &mt9m001->icd;
+	icd->probe	= mt9m001_video_probe;
+	icd->remove	= mt9m001_video_remove;
 	icd->ops	= &mt9m001_ops;
 	icd->control	= &client->dev;
 	icd->x_min	= 20;