[media] soc-camera/sh_mobile_csi2: remove unused driver

The sh_mobile_csi2 isn't used anymore (was it ever?), so remove it.
Especially since the soc-camera framework is being deprecated.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

6 files changed, 10 insertions, 676 deletions

diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig
index 39f66414f621..99cf471a5fc0 100644
--- a/drivers/media/platform/soc_camera/Kconfig
+++ b/drivers/media/platform/soc_camera/Kconfig
@@ -35,13 +35,6 @@ config VIDEO_RCAR_VIN_OLD
         ---help---
           This is a v4l2 driver for the R-Car VIN Interface
 
-config VIDEO_SH_MOBILE_CSI2
-        tristate "SuperH Mobile MIPI CSI-2 Interface driver"
-        depends on VIDEO_DEV && SOC_CAMERA && HAVE_CLK
-        depends on ARCH_SHMOBILE || SUPERH || COMPILE_TEST
-        ---help---
-          This is a v4l2 driver for the SuperH MIPI CSI-2 Interface
-
 config VIDEO_SH_MOBILE_CEU
         tristate "SuperH Mobile CEU Interface driver"
         depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK
diff --git a/drivers/media/platform/soc_camera/Makefile b/drivers/media/platform/soc_camera/Makefile
index 7703cb7ce456..ee8f9a4ae2a4 100644
--- a/drivers/media/platform/soc_camera/Makefile
+++ b/drivers/media/platform/soc_camera/Makefile
@@ -9,5 +9,4 @@ obj-$(CONFIG_SOC_CAMERA_PLATFORM)	+= soc_camera_platform.o
 obj-$(CONFIG_VIDEO_ATMEL_ISI)           += atmel-isi.o
 obj-$(CONFIG_VIDEO_PXA27x)              += pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)       += sh_mobile_ceu_camera.o
-obj-$(CONFIG_VIDEO_SH_MOBILE_CSI2)      += sh_mobile_csi2.o
 obj-$(CONFIG_VIDEO_RCAR_VIN_OLD)        += rcar_vin.o
diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
index 02b519dde42a..05eafe3a421e 100644
--- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
@@ -41,7 +41,6 @@
 #include <media/v4l2-dev.h>
 #include <media/soc_camera.h>
 #include <media/drv-intf/sh_mobile_ceu.h>
-#include <media/drv-intf/sh_mobile_csi2.h>
 #include <media/videobuf2-dma-contig.h>
 #include <media/v4l2-mediabus.h>
 #include <media/drv-intf/soc_mediabus.h>
@@ -99,11 +98,6 @@ struct sh_mobile_ceu_buffer {
 
 struct sh_mobile_ceu_dev {
         struct soc_camera_host ici;
-        /* Asynchronous CSI2 linking */
-        struct v4l2_async_subdev *csi2_asd;
-        struct v4l2_subdev *csi2_sd;
-        /* Synchronous probing compatibility */
-        struct platform_device *csi2_pdev;
 
         unsigned int irq;
         void __iomem *base;
@@ -517,74 +511,20 @@ out:
         return IRQ_HANDLED;
 }
 
-static struct v4l2_subdev *find_csi2(struct sh_mobile_ceu_dev *pcdev)
-{
-        struct v4l2_subdev *sd;
-
-        if (pcdev->csi2_sd)
-                return pcdev->csi2_sd;
-
-        if (pcdev->csi2_asd) {
-                char name[] = "sh-mobile-csi2";
-                v4l2_device_for_each_subdev(sd, &pcdev->ici.v4l2_dev)
-                        if (!strncmp(name, sd->name, sizeof(name) - 1)) {
-                                pcdev->csi2_sd = sd;
-                                return sd;
-                        }
-        }
-
-        return NULL;
-}
-
-static struct v4l2_subdev *csi2_subdev(struct sh_mobile_ceu_dev *pcdev,
-                                       struct soc_camera_device *icd)
-{
-        struct v4l2_subdev *sd = pcdev->csi2_sd;
-
-        return sd && sd->grp_id == soc_camera_grp_id(icd) ? sd : NULL;
-}
-
 static int sh_mobile_ceu_add_device(struct soc_camera_device *icd)
 {
-        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
-        struct sh_mobile_ceu_dev *pcdev = ici->priv;
-        struct v4l2_subdev *csi2_sd = find_csi2(pcdev);
-        int ret;
-
-        if (csi2_sd) {
-                csi2_sd->grp_id = soc_camera_grp_id(icd);
-                v4l2_set_subdev_hostdata(csi2_sd, icd);
-        }
-
-        ret = v4l2_subdev_call(csi2_sd, core, s_power, 1);
-        if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV)
-                return ret;
-
-        /*
-         * -ENODEV is special: either csi2_sd == NULL or the CSI-2 driver
-         * has not found this soc-camera device among its clients
-         */
-        if (csi2_sd && ret == -ENODEV)
-                csi2_sd->grp_id = 0;
-
         dev_info(icd->parent,
-                 "SuperH Mobile CEU%s driver attached to camera %d\n",
-                 csi2_sd && csi2_sd->grp_id ? "/CSI-2" : "", icd->devnum);
+                 "SuperH Mobile CEU driver attached to camera %d\n",
+                 icd->devnum);
 
         return 0;
 }
 
 static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd)
 {
-        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
-        struct sh_mobile_ceu_dev *pcdev = ici->priv;
-        struct v4l2_subdev *csi2_sd = find_csi2(pcdev);
-
         dev_info(icd->parent,
                  "SuperH Mobile CEU driver detached from camera %d\n",
                  icd->devnum);
-
-        v4l2_subdev_call(csi2_sd, core, s_power, 0);
 }
 
 /* Called with .host_lock held */
@@ -704,12 +644,6 @@ static void sh_mobile_ceu_set_rect(struct soc_camera_device *icd)
                 cdwdr_width *= 2;
         }
 
-        /* CSI2 special configuration */
-        if (csi2_subdev(pcdev, icd)) {
-                in_width = ((in_width - 2) * 2);
-                left_offset *= 2;
-        }
-
         /* Set CAMOR, CAPWR, CFSZR, take care of CDWDR */
         camor = left_offset | (top_offset << 16);
 
@@ -758,13 +692,6 @@ static void capture_restore(struct sh_mobile_ceu_dev *pcdev, u32 capsr)
                 ceu_write(pcdev, CAPSR, capsr);
 }
 
-/* Find the bus subdevice driver, e.g., CSI2 */
-static struct v4l2_subdev *find_bus_subdev(struct sh_mobile_ceu_dev *pcdev,
-                                           struct soc_camera_device *icd)
-{
-        return csi2_subdev(pcdev, icd) ? : soc_camera_to_subdev(icd);
-}
-
 #define CEU_BUS_FLAGS (V4L2_MBUS_MASTER |       \
                 V4L2_MBUS_PCLK_SAMPLE_RISING |  \
                 V4L2_MBUS_HSYNC_ACTIVE_HIGH |   \
@@ -778,7 +705,7 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd)
 {
         struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
         struct sh_mobile_ceu_dev *pcdev = ici->priv;
-        struct v4l2_subdev *sd = find_bus_subdev(pcdev, icd);
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);