Skip to contentSkip to conversation

media: atomisp: Disable VCM for OV5693 for now

PATCH In review Hans de Goede 1 participant 3 messages Aug 13, 2023

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 media: atomisp: Disable VCM for OV5693 for now

ov5693 sensor modules have a VCM, but for unknown reasons the sensor fails to start streaming when instantiating a VCM i2c-client (and the runtime-pm link between VCM and sensor).

Disable the VCM for now, until this is resolved.

---
 drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c +6 -1
index 03940c11505f..2483eaeeac73 100644
@@ -521,7 +521,12 @@ static char *atomisp_csi2_get_vcm_type(struct acpi_device *adev)
 }
 
 static const struct acpi_device_id atomisp_sensor_configs[] = {
-	ATOMISP_SENSOR_CONFIG("INT33BE", 2, true),	/* OV5693 */
+	/*
+	 * FIXME ov5693 modules have a VCM, but for unknown reasons
+	 * the sensor fails to start streaming when instantiating
+	 * an i2c-client for the VCM, so it is disabled for now.
+	 */
+	ATOMISP_SENSOR_CONFIG("INT33BE", 2, false),	/* OV5693 */
 	{}
 };
 
Signature · 1 line
2.41.0
#1 lore raw

PATCH 2/2 media: atomisp: Drop atomisp-ov5693 sensor driver

After recent improvements to atomisp driver, the atomisp driver now works fine with the standard ov5693 driver.

Drop the no longer necessary atomisp specific atomisp-ov5693 sensor driver.

---
 drivers/staging/media/atomisp/i2c/Kconfig     |   12 -
 drivers/staging/media/atomisp/i2c/Makefile    |    1 -
 .../staging/media/atomisp/i2c/ov5693/Makefile |    2 -
 .../staging/media/atomisp/i2c/ov5693/ad5823.h |   63 -
 .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 1763 -----------------
 .../staging/media/atomisp/i2c/ov5693/ov5693.h | 1331 -------------
 6 files changed, 3172 deletions(-)
 delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/Makefile
 delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ad5823.h
 delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
 delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ov5693.h
drivers/staging/media/atomisp/i2c/Kconfig +0 -12
index 2d4165cda2f1..f62d183b787f 100644
@@ -57,18 +57,6 @@ config VIDEO_ATOMISP_GC0310
 	  This is a Video4Linux2 sensor-level driver for the Galaxycore
 	  GC0310 0.3MP sensor.
 
-config VIDEO_ATOMISP_OV5693
-	tristate "Omnivision ov5693 sensor support"
-	depends on ACPI
-	depends on I2C && VIDEO_DEV
-	help
-	  This is a Video4Linux2 sensor-level driver for the Micron
-	  ov5693 5 Mpixel camera.
-
-	  ov5693 is video camera sensor.
-
-	  It currently only works with the atomisp driver.
-
 #
 # Kconfig for flash drivers
 #
drivers/staging/media/atomisp/i2c/Makefile +0 -1
index fc55af5f3422..e946cc91e5ff 100644
@@ -3,7 +3,6 @@
 # Makefile for sensor drivers
 #
 
-obj-$(CONFIG_VIDEO_ATOMISP_OV5693)     += ov5693/
 obj-$(CONFIG_VIDEO_ATOMISP_MT9M114)    += atomisp-mt9m114.o
 obj-$(CONFIG_VIDEO_ATOMISP_GC2235)     += atomisp-gc2235.o
 obj-$(CONFIG_VIDEO_ATOMISP_OV2722)     += atomisp-ov2722.o
drivers/staging/media/atomisp/i2c/ov5693/Makefile deleted +0 -2
deleted file mode 100644
index 3275f2be229e..000000000000
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_VIDEO_ATOMISP_OV5693) += atomisp-ov5693.o
drivers/staging/media/atomisp/i2c/ov5693/ad5823.h deleted +0 -63

63 lines not on this page · raw message

drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c deleted +0 -1763

1,763 lines not on this page · raw message

drivers/staging/media/atomisp/i2c/ov5693/ov5693.h deleted +0 -1331

1,147 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.41.0

Part of the diff is not shown here. View the raw message.

#2 lore raw
In reply to Hans de Goede

Hi,

Quoted 8 lines · Hans de Goede

ov5693 sensor modules have a VCM, but for unknown reasons the sensor fails to start streaming when instantiating a VCM i2c-client (and the runtime-pm link between VCM and sensor).

Disable the VCM for now, until this is resolved.

Note I have applied this series and 3 other pending atomisp patches from me to my media-atomisp branch now.

Sorry for not giving any time for review, but I believe these to be obviously correct (or at least the right thing to do for now for 1/2) and I'm preparing my media-atomisp branch to send a pull-req to Mauro for the upcoming 6.6 cycle.

Regards,

Hans

Quoted 22 lines
---
 drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c +6 -1
index 03940c11505f..2483eaeeac73 100644
@@ -521,7 +521,12 @@ static char *atomisp_csi2_get_vcm_type(struct acpi_device *adev)
 }
 
 static const struct acpi_device_id atomisp_sensor_configs[] = {
-	ATOMISP_SENSOR_CONFIG("INT33BE", 2, true),	/* OV5693 */
+	/*
+	 * FIXME ov5693 modules have a VCM, but for unknown reasons
+	 * the sensor fails to start streaming when instantiating
+	 * an i2c-client for the VCM, so it is disabled for now.
+	 */
+	ATOMISP_SENSOR_CONFIG("INT33BE", 2, false),	/* OV5693 */
 	{}
 };