[media] move soc_camera i2c drivers into its own dir

Move all soc_camera i2c drivers into drivers/media/i2c/soc_camera/.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

23 files changed, 109 insertions, 102 deletions

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 1c677f5e3a1a..7fe4acf2f80b 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -562,5 +562,9 @@ config VIDEO_M52790
          To compile this driver as a module, choose M here: the
          module will be called m52790.
 
+if SOC_CAMERA
+        source "drivers/media/i2c/soc_camera/Kconfig"
+endif
+
 endmenu
 endif
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index 93e8c1439596..088a46015605 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -4,6 +4,7 @@ obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o
 obj-$(CONFIG_VIDEO_SMIAPP)      += smiapp/
 obj-$(CONFIG_VIDEO_CX25840) += cx25840/
 obj-$(CONFIG_VIDEO_M5MOLS)      += m5mols/
+obj-y                           += soc_camera/
 
 obj-$(CONFIG_VIDEO_APTINA_PLL) += aptina-pll.o
 obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
diff --git a/drivers/media/i2c/soc_camera/Kconfig b/drivers/media/i2c/soc_camera/Kconfig
new file mode 100644
index 000000000000..73fe21d1b2df
--- /dev/null
+++ b/drivers/media/i2c/soc_camera/Kconfig
@@ -0,0 +1,89 @@
+comment "soc_camera sensor drivers"
+
+config SOC_CAMERA_IMX074
+        tristate "imx074 support"
+        depends on SOC_CAMERA && I2C
+        help
+          This driver supports IMX074 cameras from Sony
+
+config SOC_CAMERA_MT9M001
+        tristate "mt9m001 support"
+        depends on SOC_CAMERA && I2C
+        select GPIO_PCA953X if MT9M001_PCA9536_SWITCH
+        help
+          This driver supports MT9M001 cameras from Micron, monochrome
+          and colour models.
+
+config SOC_CAMERA_MT9M111
+        tristate "mt9m111, mt9m112 and mt9m131 support"
+        depends on SOC_CAMERA && I2C
+        help
+          This driver supports MT9M111, MT9M112 and MT9M131 cameras from
+          Micron/Aptina
+
+config SOC_CAMERA_MT9T031
+        tristate "mt9t031 support"
+        depends on SOC_CAMERA && I2C
+        help
+          This driver supports MT9T031 cameras from Micron.
+
+config SOC_CAMERA_MT9T112
+        tristate "mt9t112 support"
+        depends on SOC_CAMERA && I2C
+        help
+          This driver supports MT9T112 cameras from Aptina.
+
+config SOC_CAMERA_MT9V022
+        tristate "mt9v022 support"
+        depends on SOC_CAMERA && I2C
+        select GPIO_PCA953X if MT9V022_PCA9536_SWITCH
+        help
+          This driver supports MT9V022 cameras from Micron
+
+config SOC_CAMERA_OV2640
+        tristate "ov2640 camera support"
+        depends on SOC_CAMERA && I2C
+        help
+          This is a ov2640 camera driver
+
+config SOC_CAMERA_OV5642
+        tristate "ov5642 camera support"
+        depends on SOC_CAMERA && I2C
+        help
+          This is a V4L2 camera driver for the OmniVision OV5642 sensor
+
+config SOC_CAMERA_OV6650
+        tristate "ov6650 sensor support"
+        depends on SOC_CAMERA && I2C
+        ---help---
+          This is a V4L2 SoC camera driver for the OmniVision OV6650 sensor
+
+config SOC_CAMERA_OV772X
+        tristate "ov772x camera support"
+        depends on SOC_CAMERA && I2C
+        help
+          This is a ov772x camera driver
+
+config SOC_CAMERA_OV9640
+        tristate "ov9640 camera support"
+        depends on SOC_CAMERA && I2C
+        help
+          This is a ov9640 camera driver
+
+config SOC_CAMERA_OV9740
+        tristate "ov9740 camera support"
+        depends on SOC_CAMERA && I2C
+        help
+          This is a ov9740 camera driver
+
+config SOC_CAMERA_RJ54N1
+        tristate "rj54n1cb0c support"
+        depends on SOC_CAMERA && I2C
+        help
+          This is a rj54n1cb0c video driver
+
+config SOC_CAMERA_TW9910
+        tristate "tw9910 support"
+        depends on SOC_CAMERA && I2C
+        help
+          This is a tw9910 video driver
diff --git a/drivers/media/i2c/soc_camera/Makefile b/drivers/media/i2c/soc_camera/Makefile
new file mode 100644
index 000000000000..d0421feaa796
--- /dev/null
+++ b/drivers/media/i2c/soc_camera/Makefile
@@ -0,0 +1,14 @@
+obj-$(CONFIG_SOC_CAMERA_IMX074)         += imx074.o
+obj-$(CONFIG_SOC_CAMERA_MT9M001)        += mt9m001.o
+obj-$(CONFIG_SOC_CAMERA_MT9M111)        += mt9m111.o
+obj-$(CONFIG_SOC_CAMERA_MT9T031)        += mt9t031.o
+obj-$(CONFIG_SOC_CAMERA_MT9T112)        += mt9t112.o
+obj-$(CONFIG_SOC_CAMERA_MT9V022)        += mt9v022.o
+obj-$(CONFIG_SOC_CAMERA_OV2640)         += ov2640.o
+obj-$(CONFIG_SOC_CAMERA_OV5642)         += ov5642.o
+obj-$(CONFIG_SOC_CAMERA_OV6650)         += ov6650.o
+obj-$(CONFIG_SOC_CAMERA_OV772X)         += ov772x.o
+obj-$(CONFIG_SOC_CAMERA_OV9640)         += ov9640.o
+obj-$(CONFIG_SOC_CAMERA_OV9740)         += ov9740.o
+obj-$(CONFIG_SOC_CAMERA_RJ54N1)         += rj54n1cb0c.o
+obj-$(CONFIG_SOC_CAMERA_TW9910)         += tw9910.o
diff --git a/drivers/media/video/imx074.c b/drivers/media/i2c/soc_camera/imx074.c
index 351e9bafe8fe..351e9bafe8fe 100644
--- a/drivers/media/video/imx074.c
+++ b/drivers/media/i2c/soc_camera/imx074.c
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/i2c/soc_camera/mt9m001.c
index 00583f5fd26b..00583f5fd26b 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/i2c/soc_camera/mt9m001.c
diff --git a/drivers/media/video/mt9m111.c b/drivers/media/i2c/soc_camera/mt9m111.c
index 863d722dda06..863d722dda06 100644
--- a/drivers/media/video/mt9m111.c
+++ b/drivers/media/i2c/soc_camera/mt9m111.c
diff --git a/drivers/media/video/mt9t031.c b/drivers/media/i2c/soc_camera/mt9t031.c
index 1415074138a5..1415074138a5 100644
--- a/drivers/media/video/mt9t031.c
+++ b/drivers/media/i2c/soc_camera/mt9t031.c
diff --git a/drivers/media/video/mt9t112.c b/drivers/media/i2c/soc_camera/mt9t112.c
index e1ae46a7ee96..e1ae46a7ee96 100644
--- a/drivers/media/video/mt9t112.c
+++ b/drivers/media/i2c/soc_camera/mt9t112.c
diff --git a/drivers/media/video/mt9v022.c b/drivers/media/i2c/soc_camera/mt9v022.c
index 72479247522a..72479247522a 100644
--- a/drivers/media/video/mt9v022.c
+++ b/drivers/media/i2c/soc_camera/mt9v022.c
diff --git a/drivers/media/video/ov2640.c b/drivers/media/i2c/soc_camera/ov2640.c
index 7c44d1fe3c87..7c44d1fe3c87 100644
--- a/drivers/media/video/ov2640.c
+++ b/drivers/media/i2c/soc_camera/ov2640.c
diff --git a/drivers/media/video/ov5642.c b/drivers/media/i2c/soc_camera/ov5642.c
index 0bc93313d37a..0bc93313d37a 100644
--- a/drivers/media/video/ov5642.c
+++ b/drivers/media/i2c/soc_camera/ov5642.c
diff --git a/drivers/media/video/ov6650.c b/drivers/media/i2c/soc_camera/ov6650.c
index 3e028b1970dd..3e028b1970dd 100644
--- a/drivers/media/video/ov6650.c
+++ b/drivers/media/i2c/soc_camera/ov6650.c
diff --git a/drivers/media/video/ov772x.c b/drivers/media/i2c/soc_camera/ov772x.c
index 6d79b89b8603..6d79b89b8603 100644
--- a/drivers/media/video/ov772x.c
+++ b/drivers/media/i2c/soc_camera/ov772x.c
diff --git a/drivers/media/video/ov9640.c b/drivers/media/i2c/soc_camera/ov9640.c
index 9ed4ba4236c4..9ed4ba4236c4 100644
--- a/drivers/media/video/ov9640.c
+++ b/drivers/media/i2c/soc_camera/ov9640.c
diff --git a/drivers/media/video/ov9640.h b/drivers/media/i2c/soc_camera/ov9640.h
index 6b33a972c83c..6b33a972c83c 100644
--- a/drivers/media/video/ov9640.h
+++ b/drivers/media/i2c/soc_camera/ov9640.h
diff --git a/drivers/media/video/ov9740.c b/drivers/media/i2c/soc_camera/ov9740.c
index 3eb07c22516e..3eb07c22516e 100644
--- a/drivers/media/video/ov9740.c
+++ b/drivers/media/i2c/soc_camera/ov9740.c
diff --git a/drivers/media/video/rj54n1cb0c.c b/drivers/media/i2c/soc_camera/rj54n1cb0c.c
index f6419b22c258..f6419b22c258 100644
--- a/drivers/media/video/rj54n1cb0c.c
+++ b/drivers/media/i2c/soc_camera/rj54n1cb0c.c
diff --git a/drivers/media/video/sh_mobile_csi2.c b/drivers/media/i2c/soc_camera/sh_mobile_csi2.c
index 05286500b4d4..05286500b4d4 100644
--- a/drivers/media/video/sh_mobile_csi2.c
+++ b/drivers/media/i2c/soc_camera/sh_mobile_csi2.c
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/i2c/soc_camera/soc_camera.c
index 9758217470f0..9758217470f0 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/i2c/soc_camera/soc_camera.c
diff --git a/drivers/media/video/tw9910.c b/drivers/media/i2c/soc_camera/tw9910.c
index 9f53eacb66e3..9f53eacb66e3 100644
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/i2c/soc_camera/tw9910.c
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index f2171e777dd3..28b25bf35805 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -127,57 +127,6 @@ config SOC_CAMERA
           over a bus like PCI or USB. For example some i2c camera connected
           directly to the data bus of an SoC.
 
-config SOC_CAMERA_IMX074
-        tristate "imx074 support"
-        depends on SOC_CAMERA && I2C
-        help
-          This driver supports IMX074 cameras from Sony
-
-config SOC_CAMERA_MT9M001
-        tristate "mt9m001 support"
-        depends on SOC_CAMERA && I2C
-        select GPIO_PCA953X if MT9M001_PCA9536_SWITCH
-        help
-          This driver supports MT9M001 cameras from Micron, monochrome
-          and colour models.
-
-config SOC_CAMERA_MT9M111
-        tristate "mt9m111, mt9m112 and mt9m131 support"
-        depends on SOC_CAMERA && I2C
-        help
-          This driver supports MT9M111, MT9M112 and MT9M131 cameras from
-          Micron/Aptina
-
-config SOC_CAMERA_MT9T031
-        tristate "mt9t031 support"
-        depends on SOC_CAMERA && I2C
-        help
-          This driver supports MT9T031 cameras from Micron.
-
-config SOC_CAMERA_MT9T112
-        tristate "mt9t112 support"
-        depends on SOC_CAMERA && I2C
-        help
-          This driver supports MT9T112 cameras from Aptina.
-
-config SOC_CAMERA_MT9V022
-        tristate "mt9v022 support"
-        depends on SOC_CAMERA && I2C
-        select GPIO_PCA953X if MT9V022_PCA9536_SWITCH
-        help
-          This driver supports MT9V022 cameras from Micron
-
-config SOC_CAMERA_RJ54N1
-        tristate "rj54n1cb0c support"
-        depends on SOC_CAMERA && I2C
-        help
-          This is a rj54n1cb0c video driver
-
-config SOC_CAMERA_TW9910
-        tristate "tw9910 support"
-        depends on SOC_CAMERA && I2C
-        help
-          This is a tw9910 video driver
 
 config SOC_CAMERA_PLATFORM
         tristate "platform camera support"
@@ -185,42 +134,6 @@ config SOC_CAMERA_PLATFORM
         help
           This is a generic SoC camera platform driver, useful for testing
 
-config SOC_CAMERA_OV2640
-        tristate "ov2640 camera support"
-        depends on SOC_CAMERA && I2C
-        help
-          This is a ov2640 camera driver
-
-config SOC_CAMERA_OV5642
-        tristate "ov5642 camera support"
-        depends on SOC_CAMERA && I2C
-        help
-          This is a V4L2 camera driver for the OmniVision OV5642 sensor
-
-config SOC_CAMERA_OV6650
-        tristate "ov6650 sensor support"
-        depends on SOC_CAMERA && I2C
-        ---help---
-          This is a V4L2 SoC camera driver for the OmniVision OV6650 sensor
-
-config SOC_CAMERA_OV772X
-        tristate "ov772x camera support"
-        depends on SOC_CAMERA && I2C
-        help
-          This is a ov772x camera driver
-
-config SOC_CAMERA_OV9640
-        tristate "ov9640 camera support"
-        depends on SOC_CAMERA && I2C
-        help
-          This is a ov9640 camera driver
-
-config SOC_CAMERA_OV9740
-        tristate "ov9740 camera support"
-        depends on SOC_CAMERA && I2C
-        help
-          This is a ov9740 camera driver
-
 config MX1_VIDEO
         bool
 
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 52a04faa60e8..b3effdc65f76 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -6,21 +6,6 @@ omap2cam-objs	:=	omap24xxcam.o omap24xxcam-dma.o
 
 obj-$(CONFIG_VIDEO_VINO) += indycam.o
 
-obj-$(CONFIG_SOC_CAMERA_IMX074)         += imx074.o
-obj-$(CONFIG_SOC_CAMERA_MT9M001)        += mt9m001.o
-obj-$(CONFIG_SOC_CAMERA_MT9M111)        += mt9m111.o
-obj-$(CONFIG_SOC_CAMERA_MT9T031)        += mt9t031.o
-obj-$(CONFIG_SOC_CAMERA_MT9T112)        += mt9t112.o
-obj-$(CONFIG_SOC_CAMERA_MT9V022)        += mt9v022.o
-obj-$(CONFIG_SOC_CAMERA_OV2640)         += ov2640.o
-obj-$(CONFIG_SOC_CAMERA_OV5642)         += ov5642.o
-obj-$(CONFIG_SOC_CAMERA_OV6650)         += ov6650.o
-obj-$(CONFIG_SOC_CAMERA_OV772X)         += ov772x.o
-obj-$(CONFIG_SOC_CAMERA_OV9640)         += ov9640.o
-obj-$(CONFIG_SOC_CAMERA_OV9740)         += ov9740.o
-obj-$(CONFIG_SOC_CAMERA_RJ54N1)         += rj54n1cb0c.o
-obj-$(CONFIG_SOC_CAMERA_TW9910)         += tw9910.o
-
 obj-$(CONFIG_VIDEO_VINO) += vino.o
 obj-$(CONFIG_VIDEO_TIMBERDALE)  += timblogiw.o
 
@@ -78,3 +63,4 @@ obj-$(CONFIG_ARCH_OMAP)	+= omap/
 ccflags-y += -I$(srctree)/drivers/media/dvb-core
 ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
 ccflags-y += -I$(srctree)/drivers/media/tuners
+ccflags-y += -I$(srctree)/drivers/media/i2c/soc_camera