From: Robert Jarzmik <robert.jarzmik@free.fr>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
Jiri Kosina <trivial@kernel.org>,
Hans Verkuil <hverkuil@xs4all.nl>
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Robert Jarzmik <robert.jarzmik@free.fr>
Subject: [PATCH v6 03/14] media: mt9m111: move mt9m111 out of soc_camera
Date: Tue, 6 Sep 2016 11:04:13 +0200 [thread overview]
Message-ID: <1473152664-5077-3-git-send-email-robert.jarzmik@free.fr> (raw)
In-Reply-To: <1473152664-5077-1-git-send-email-robert.jarzmik@free.fr>
As the mt9m111 is now working as a standalone v4l2 subdevice sensor,
move it out of soc_camera directory and severe its dependency on
soc_camera.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
drivers/media/i2c/Kconfig | 7 +++++++
drivers/media/i2c/Makefile | 1 +
drivers/media/i2c/{soc_camera => }/mt9m111.c | 0
drivers/media/i2c/soc_camera/Kconfig | 7 +++++--
drivers/media/i2c/soc_camera/Makefile | 1 -
5 files changed, 13 insertions(+), 3 deletions(-)
rename drivers/media/i2c/{soc_camera => }/mt9m111.c (100%)
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 92cc54401339..7f929336c409 100644
--- 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 0216af0f9281..92773b2e6225 100644
--- 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 23d352f0adf0..7704bcf5cc25 100644
--- 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 d0421feaa796..6f994f9353a0 100644
--- 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
--
2.1.4
next prev parent reply other threads:[~2016-09-06 9:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-06 9:04 [PATCH v6 01/14] media: mt9m111: make a standalone v4l2 subdevice Robert Jarzmik
2016-09-06 9:04 ` [PATCH v6 02/14] media: mt9m111: use only the SRGB colorspace Robert Jarzmik
2016-09-06 9:04 ` Robert Jarzmik [this message]
2016-09-06 9:04 ` [PATCH v6 04/14] media: platform: pxa_camera: convert to vb2 Robert Jarzmik
2016-09-06 9:04 ` [PATCH v6 05/14] media: platform: pxa_camera: trivial move of functions Robert Jarzmik
2016-09-06 9:04 ` [PATCH v6 06/14] media: platform: pxa_camera: introduce sensor_call Robert Jarzmik
2016-09-06 9:04 ` [PATCH v6 07/14] media: platform: pxa_camera: make printk consistent Robert Jarzmik
2016-09-06 9:04 ` [PATCH v6 08/14] media: platform: pxa_camera: add buffer sequencing Robert Jarzmik
2016-09-06 9:04 ` [PATCH v6 09/14] media: platform: pxa_camera: remove set_selection Robert Jarzmik
2016-09-06 9:04 ` [PATCH v6 10/14] media: platform: pxa_camera: make a standalone v4l2 device Robert Jarzmik
2016-09-06 9:04 ` [PATCH v6 11/14] media: platform: pxa_camera: add debug register access Robert Jarzmik
2016-09-06 9:04 ` [PATCH v6 12/14] media: platform: pxa_camera: change stop_streaming semantics Robert Jarzmik
2016-09-06 9:04 ` [PATCH v6 13/14] media: platform: pxa_camera: move pxa_camera out of soc_camera Robert Jarzmik
2016-09-06 10:20 ` Hans Verkuil
2016-09-06 9:04 ` [PATCH v6 14/14] media: platform: pxa_camera: fix style Robert Jarzmik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473152664-5077-3-git-send-email-robert.jarzmik@free.fr \
--to=robert.jarzmik@free.fr \
--cc=g.liakhovetski@gmx.de \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=trivial@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).