[media] media: mt9m111: move mt9m111 out of soc_camera

As the mt9m111 is now working as a standalone v4l2 subdevice sensor,
move it out of soc_camera directory and sever its dependency on
soc_camera.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 92cc5440133968f41b3ece6998b103c2c39e4850..7f929336c40928aa16388c686bfc1a2761e41d23 100644 (file)
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -578,6 +578,13 @@ config VIDEO_MT9M032
          This driver supports MT9M032 camera sensors from Aptina, monochrome
          models only.
 
+config VIDEO_MT9M111
+       tristate "mt9m111, mt9m112 and mt9m131 support"
+       depends on I2C && VIDEO_V4L2
+       help
+         This driver supports MT9M111, MT9M112 and MT9M131 cameras from
+         Micron/Aptina
+
 config VIDEO_MT9P031
        tristate "Aptina MT9P031 support"
        depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API

diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index 0216af0f928179f00086b5019ab6f983b8ba2fb1..92773b2e62257db49ccced3af7503592492ec78d 100644 (file)
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -60,6 +60,7 @@ obj-$(CONFIG_VIDEO_OV7640) += ov7640.o
 obj-$(CONFIG_VIDEO_OV7670) += ov7670.o
 obj-$(CONFIG_VIDEO_OV9650) += ov9650.o
 obj-$(CONFIG_VIDEO_MT9M032) += mt9m032.o
+obj-$(CONFIG_VIDEO_MT9M111) += mt9m111.o
 obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o
 obj-$(CONFIG_VIDEO_MT9T001) += mt9t001.o
 obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o

diff --git a/drivers/media/i2c/soc_camera/mt9m111.c b/drivers/media/i2c/mt9m111.c
similarity index 100%
rename from drivers/media/i2c/soc_camera/mt9m111.c
rename to drivers/media/i2c/mt9m111.c

diff --git a/drivers/media/i2c/soc_camera/Kconfig b/drivers/media/i2c/soc_camera/Kconfig
index 23d352f0adf0af58290e342aa4ed90f12b5df2e6..7704bcf5cc2537056df3d4d5ae021365e69cb16e 100644 (file)
--- a/drivers/media/i2c/soc_camera/Kconfig
+++ b/drivers/media/i2c/soc_camera/Kconfig
@@ -14,11 +14,14 @@ config SOC_CAMERA_MT9M001
          and colour models.
 
 config SOC_CAMERA_MT9M111
-       tristate "mt9m111, mt9m112 and mt9m131 support"
+       tristate "legacy soc_camera mt9m111, mt9m112 and mt9m131 support"
        depends on SOC_CAMERA && I2C
+       select VIDEO_MT9M111
        help
          This driver supports MT9M111, MT9M112 and MT9M131 cameras from
-         Micron/Aptina
+         Micron/Aptina.
+         This is the legacy configuration which shouldn't be used anymore,
+         while VIDEO_MT9M111 should be used instead.
 
 config SOC_CAMERA_MT9T031
        tristate "mt9t031 support"

diff --git a/drivers/media/i2c/soc_camera/Makefile b/drivers/media/i2c/soc_camera/Makefile
index d0421feaa796115be0987dcad61f32b19312532f..6f994f9353a055e9758146e1696a9cc808bf82e4 100644 (file)
--- a/drivers/media/i2c/soc_camera/Makefile
+++ b/drivers/media/i2c/soc_camera/Makefile
@@ -1,6 +1,5 @@
 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