linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: hverkuil@xs4all.nl
Subject: [PATCH 3/4] soc_camera: Move the mt9t031 under soc_camera directory
Date: Fri,  8 Feb 2019 10:41:46 +0200	[thread overview]
Message-ID: <20190208084147.9973-4-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20190208084147.9973-1-sakari.ailus@linux.intel.com>

Move the mt9t031 driver to the soc_camera directory in the media staging
tree.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 drivers/staging/media/Kconfig                           | 2 --
 drivers/staging/media/Makefile                          | 1 -
 drivers/staging/media/soc_camera/Kconfig                | 6 ++++++
 drivers/staging/media/soc_camera/Makefile               | 1 +
 drivers/staging/media/{mt9t031 => soc_camera}/mt9t031.c | 0
 5 files changed, 7 insertions(+), 3 deletions(-)
 rename drivers/staging/media/{mt9t031 => soc_camera}/mt9t031.c (100%)

diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index fce8933216241..1da5c20d65c04 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -25,8 +25,6 @@ source "drivers/staging/media/davinci_vpfe/Kconfig"
 
 source "drivers/staging/media/imx/Kconfig"
 
-source "drivers/staging/media/mt9t031/Kconfig"
-
 source "drivers/staging/media/omap4iss/Kconfig"
 
 source "drivers/staging/media/rockchip/vpu/Kconfig"
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 74920289b0d94..0355e3030504d 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_I2C_BCM2048)	+= bcm2048/
 obj-$(CONFIG_VIDEO_IMX_MEDIA)	+= imx/
-obj-$(CONFIG_SOC_CAMERA_MT9T031)	+= mt9t031/
 obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/
 obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
 obj-$(CONFIG_VIDEO_SUNXI)	+= sunxi/
diff --git a/drivers/staging/media/soc_camera/Kconfig b/drivers/staging/media/soc_camera/Kconfig
index e6bd04840971c..6a6aa6d2d150e 100644
--- a/drivers/staging/media/soc_camera/Kconfig
+++ b/drivers/staging/media/soc_camera/Kconfig
@@ -42,3 +42,9 @@ config SOC_CAMERA_IMX074
 	depends on SOC_CAMERA && I2C
 	help
 	  This driver supports IMX074 cameras from Sony
+
+config SOC_CAMERA_MT9T031
+	tristate "mt9t031 support (DEPRECATED)"
+	depends on SOC_CAMERA && I2C
+	help
+	  This driver supports MT9T031 cameras from Micron.
diff --git a/drivers/staging/media/soc_camera/Makefile b/drivers/staging/media/soc_camera/Makefile
index 09560dc32c4c7..3a351bd629f59 100644
--- a/drivers/staging/media/soc_camera/Makefile
+++ b/drivers/staging/media/soc_camera/Makefile
@@ -4,3 +4,4 @@ obj-$(CONFIG_SOC_CAMERA_MT9V022)	+= soc_mt9v022.o
 obj-$(CONFIG_SOC_CAMERA_OV5642)		+= soc_ov5642.o
 obj-$(CONFIG_SOC_CAMERA_OV9740)		+= soc_ov9740.o
 obj-$(CONFIG_SOC_CAMERA_IMX074)		+= imx074.o
+obj-$(CONFIG_SOC_CAMERA_MT9T031)	+= mt9t031.o
diff --git a/drivers/staging/media/mt9t031/mt9t031.c b/drivers/staging/media/soc_camera/mt9t031.c
similarity index 100%
rename from drivers/staging/media/mt9t031/mt9t031.c
rename to drivers/staging/media/soc_camera/mt9t031.c
-- 
2.11.0


  parent reply	other threads:[~2019-02-08  8:42 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-08  8:41 [PATCH 0/4] Move SoC camera to staging, depend on BROKEN Sakari Ailus
2019-02-08  8:41 ` [PATCH 1/4] soc_camera: Move to the staging tree Sakari Ailus
2019-02-08  8:41 ` [PATCH 2/4] soc_camera: Move the imx074 under soc_camera directory Sakari Ailus
2019-02-08  8:41 ` Sakari Ailus [this message]
2019-02-08  8:41 ` [PATCH 4/4] soc_camera: Depend on BROKEN Sakari Ailus
2019-02-08  8:43 ` [PATCH 0/4] Move SoC camera to staging, depend " Sakari Ailus
2019-02-08  8:52 ` Hans Verkuil

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=20190208084147.9973-4-sakari.ailus@linux.intel.com \
    --to=sakari.ailus@linux.intel.com \
    --cc=hverkuil@xs4all.nl \
    --cc=linux-media@vger.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).