media: Move gc0310 sensor drivers to drivers/media/i2c/

The atomisp gc0310 sensor driver has now been fully converted to
a standard v4l2 sensor driver. Move it to drivers/media/i2c/
to reflect this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index ae89671c70a7a9acd7a50a65a75c601b409b19f8..2d5f73d632f15eb05f9d7bcfd4b663931d0902b1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10103,6 +10103,12 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/media/i2c/galaxycore,gc0308.yaml
 F:     drivers/media/i2c/gc0308.c
 
+GALAXYCORE GC0310 CAMERA SENSOR DRIVER
+M:     Hans de Goede <hansg@kernel.org>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/i2c/gc0310.c
+
 GALAXYCORE GC05a2 CAMERA SENSOR DRIVER
 M:     Zhi Mao <zhi.mao@mediatek.com>
 L:     linux-media@vger.kernel.org

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 1f5a3082ead9caf31250d3a202c39bb3bce9f21c..4fd22e49d301b66b828b8a92035ae0468dcc7254 100644 (file)
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -70,6 +70,16 @@ config VIDEO_GC0308
          To compile this driver as a module, choose M here: the
          module will be called gc0308.
 
+config VIDEO_GC0310
+       tristate "GalaxyCore GC0310 sensor support"
+       select V4L2_CCI_I2C
+       help
+         This is a Video4Linux2 sensor-level driver for the Galaxycore
+         GC0310 0.3MP sensor.
+
+         To compile this driver as a module, choose M here: the
+         module will be called gc0310.
+
 config VIDEO_GC05A2
        tristate "GalaxyCore gc05a2 sensor support"
        select V4L2_CCI_I2C

diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index 5873d29433ee5e576a0400c4e8ab2b31be4d8104..63ef5abbebf300f0a1ce17ca58d424d73265f9b4 100644 (file)
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -38,6 +38,7 @@ obj-$(CONFIG_VIDEO_DW9768) += dw9768.o
 obj-$(CONFIG_VIDEO_DW9807_VCM) += dw9807-vcm.o
 obj-$(CONFIG_VIDEO_ET8EK8) += et8ek8/
 obj-$(CONFIG_VIDEO_GC0308) += gc0308.o
+obj-$(CONFIG_VIDEO_GC0310) += gc0310.o
 obj-$(CONFIG_VIDEO_GC05A2) += gc05a2.o
 obj-$(CONFIG_VIDEO_GC08A3) += gc08a3.o
 obj-$(CONFIG_VIDEO_GC2145) += gc2145.o

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c b/drivers/media/i2c/gc0310.c
similarity index 100%
rename from drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
rename to drivers/media/i2c/gc0310.c

diff --git a/drivers/staging/media/atomisp/i2c/Kconfig b/drivers/staging/media/atomisp/i2c/Kconfig
index ef2094c22347236154a02ce8d627465c3f365977..7d447ba7a7e193df84f9e519fe039ccfe1f239cf 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/Kconfig
+++ b/drivers/staging/media/atomisp/i2c/Kconfig
@@ -26,12 +26,3 @@ config VIDEO_ATOMISP_GC2235
          GC2235 is a 2M raw sensor.
 
          It currently only works with the atomisp driver.
-
-config VIDEO_ATOMISP_GC0310
-       tristate "GC0310 sensor support"
-       depends on ACPI
-       depends on I2C && VIDEO_DEV
-       select V4L2_CCI_I2C
-       help
-         This is a Video4Linux2 sensor-level driver for the Galaxycore
-         GC0310 0.3MP sensor.

diff --git a/drivers/staging/media/atomisp/i2c/Makefile b/drivers/staging/media/atomisp/i2c/Makefile
index e1637417e5c5081def27e8cb0a12afb578314b21..161aa542ef3482b9f8ad1e2276130ce07975fae4 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/Makefile
+++ b/drivers/staging/media/atomisp/i2c/Makefile
@@ -5,4 +5,3 @@
 
 obj-$(CONFIG_VIDEO_ATOMISP_GC2235)     += atomisp-gc2235.o
 obj-$(CONFIG_VIDEO_ATOMISP_OV2722)     += atomisp-ov2722.o
-obj-$(CONFIG_VIDEO_ATOMISP_GC0310)     += atomisp-gc0310.o