linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/4] Move SoC camera to staging, depend on BROKEN
@ 2019-02-08  8:41 Sakari Ailus
  2019-02-08  8:41 ` [PATCH 1/4] soc_camera: Move to the staging tree Sakari Ailus
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Sakari Ailus @ 2019-02-08  8:41 UTC (permalink / raw)
  To: linux-media; +Cc: hverkuil

Hi all,

This series moves the SoC camera framework and the remaining drivers under
the staging tree and makes them depend on BROKEN.

The files could be later removed.

Sakari Ailus (4):
  soc_camera: Move to the staging tree
  soc_camera: Move the imx074 under soc_camera directory
  soc_camera: Move the mt9t031 under soc_camera directory
  soc_camera: Depend on BROKEN

 drivers/media/i2c/Kconfig                           |  8 --------
 drivers/media/i2c/Makefile                          |  1 -
 drivers/media/platform/Kconfig                      |  1 -
 drivers/media/platform/Makefile                     |  2 --
 drivers/media/platform/soc_camera/Kconfig           |  8 --------
 drivers/media/platform/soc_camera/Makefile          |  1 -
 drivers/staging/media/Kconfig                       |  6 ++----
 drivers/staging/media/Makefile                      |  3 +--
 drivers/staging/media/imx074/Kconfig                |  5 -----
 drivers/staging/media/imx074/Makefile               |  1 -
 drivers/staging/media/imx074/TODO                   |  5 -----
 .../{media/i2c => staging/media}/soc_camera/Kconfig | 21 +++++++++++++++++++++
 .../i2c => staging/media}/soc_camera/Makefile       |  3 +++
 .../staging/media/{imx074 => soc_camera}/imx074.c   |  0
 .../staging/media/{mt9t031 => soc_camera}/mt9t031.c |  0
 .../media}/soc_camera/soc_camera.c                  |  0
 .../media}/soc_camera/soc_mediabus.c                |  0
 .../i2c => staging/media}/soc_camera/soc_mt9v022.c  |  0
 .../i2c => staging/media}/soc_camera/soc_ov5642.c   |  0
 .../i2c => staging/media}/soc_camera/soc_ov9740.c   |  0
 20 files changed, 27 insertions(+), 38 deletions(-)
 delete mode 100644 drivers/media/platform/soc_camera/Kconfig
 delete mode 100644 drivers/media/platform/soc_camera/Makefile
 delete mode 100644 drivers/staging/media/imx074/Kconfig
 delete mode 100644 drivers/staging/media/imx074/Makefile
 delete mode 100644 drivers/staging/media/imx074/TODO
 rename drivers/{media/i2c => staging/media}/soc_camera/Kconfig (57%)
 rename drivers/{media/i2c => staging/media}/soc_camera/Makefile (55%)
 rename drivers/staging/media/{imx074 => soc_camera}/imx074.c (100%)
 rename drivers/staging/media/{mt9t031 => soc_camera}/mt9t031.c (100%)
 rename drivers/{media/platform => staging/media}/soc_camera/soc_camera.c (100%)
 rename drivers/{media/platform => staging/media}/soc_camera/soc_mediabus.c (100%)
 rename drivers/{media/i2c => staging/media}/soc_camera/soc_mt9v022.c (100%)
 rename drivers/{media/i2c => staging/media}/soc_camera/soc_ov5642.c (100%)
 rename drivers/{media/i2c => staging/media}/soc_camera/soc_ov9740.c (100%)

-- 
2.11.0


^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH 1/4] soc_camera: Move to the staging tree
  2019-02-08  8:41 [PATCH 0/4] Move SoC camera to staging, depend on BROKEN Sakari Ailus
@ 2019-02-08  8:41 ` Sakari Ailus
  2019-02-08  8:41 ` [PATCH 2/4] soc_camera: Move the imx074 under soc_camera directory Sakari Ailus
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Sakari Ailus @ 2019-02-08  8:41 UTC (permalink / raw)
  To: linux-media; +Cc: hverkuil

The SoC camera framework has no functional drivers left, something that
has not changed for years. Move the leftovers to the staging tree.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 drivers/media/i2c/Kconfig                                         | 8 --------
 drivers/media/i2c/Makefile                                        | 1 -
 drivers/media/platform/Kconfig                                    | 1 -
 drivers/media/platform/Makefile                                   | 2 --
 drivers/media/platform/soc_camera/Kconfig                         | 8 --------
 drivers/media/platform/soc_camera/Makefile                        | 1 -
 drivers/staging/media/Kconfig                                     | 2 ++
 drivers/staging/media/Makefile                                    | 1 +
 drivers/{media/i2c => staging/media}/soc_camera/Kconfig           | 8 ++++++++
 drivers/{media/i2c => staging/media}/soc_camera/Makefile          | 1 +
 drivers/{media/platform => staging/media}/soc_camera/soc_camera.c | 0
 .../{media/platform => staging/media}/soc_camera/soc_mediabus.c   | 0
 drivers/{media/i2c => staging/media}/soc_camera/soc_mt9v022.c     | 0
 drivers/{media/i2c => staging/media}/soc_camera/soc_ov5642.c      | 0
 drivers/{media/i2c => staging/media}/soc_camera/soc_ov9740.c      | 0
 15 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 drivers/media/platform/soc_camera/Kconfig
 delete mode 100644 drivers/media/platform/soc_camera/Makefile
 rename drivers/{media/i2c => staging/media}/soc_camera/Kconfig (74%)
 rename drivers/{media/i2c => staging/media}/soc_camera/Makefile (76%)
 rename drivers/{media/platform => staging/media}/soc_camera/soc_camera.c (100%)
 rename drivers/{media/platform => staging/media}/soc_camera/soc_mediabus.c (100%)
 rename drivers/{media/i2c => staging/media}/soc_camera/soc_mt9v022.c (100%)
 rename drivers/{media/i2c => staging/media}/soc_camera/soc_ov5642.c (100%)
 rename drivers/{media/i2c => staging/media}/soc_camera/soc_ov9740.c (100%)

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 19c112cda0786..6d32f8dcf83b2 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -1134,12 +1134,4 @@ config VIDEO_I2C
 
 endmenu
 
-menu "Sensors used on soc_camera driver"
-
-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 2e5e4b0bf7f3e..a64fca82e0c4b 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -6,7 +6,6 @@ obj-$(CONFIG_VIDEO_SMIAPP)	+= smiapp/
 obj-$(CONFIG_VIDEO_ET8EK8)	+= et8ek8/
 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/platform/Kconfig b/drivers/media/platform/Kconfig
index b5ccb60cf664b..6cff26b29a38f 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -141,7 +141,6 @@ config VIDEO_RENESAS_CEU
 	---help---
 	  This is a v4l2 driver for the Renesas CEU Interface
 
-source "drivers/media/platform/soc_camera/Kconfig"
 source "drivers/media/platform/exynos4-is/Kconfig"
 source "drivers/media/platform/am437x/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index e6deb25977380..7cbbd925124cf 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -62,8 +62,6 @@ obj-y					+= davinci/
 
 obj-$(CONFIG_VIDEO_SH_VOU)		+= sh_vou.o
 
-obj-$(CONFIG_SOC_CAMERA)		+= soc_camera/
-
 obj-$(CONFIG_VIDEO_RCAR_DRIF)		+= rcar_drif.o
 obj-$(CONFIG_VIDEO_RENESAS_CEU)		+= renesas-ceu.o
 obj-$(CONFIG_VIDEO_RENESAS_FCP)		+= rcar-fcp.o
diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig
deleted file mode 100644
index 8f9b3bac5450d..0000000000000
--- a/drivers/media/platform/soc_camera/Kconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-config SOC_CAMERA
-	tristate "SoC camera support"
-	depends on VIDEO_V4L2 && HAS_DMA && I2C
-	select VIDEOBUF2_CORE
-	help
-	  SoC Camera is a common API to several cameras, not connecting
-	  over a bus like PCI or USB. For example some i2c camera connected
-	  directly to the data bus of an SoC.
diff --git a/drivers/media/platform/soc_camera/Makefile b/drivers/media/platform/soc_camera/Makefile
deleted file mode 100644
index 85d5e74f3b2b2..0000000000000
--- a/drivers/media/platform/soc_camera/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_SOC_CAMERA)		+= soc_camera.o soc_mediabus.o
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 19cadd17e542a..7c3f443f27358 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -41,4 +41,6 @@ source "drivers/staging/media/zoran/Kconfig"
 
 source "drivers/staging/media/ipu3/Kconfig"
 
+source "drivers/staging/media/soc_camera/Kconfig"
+
 endif
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index edde1960b030d..9c1bb862f5c92 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -10,3 +10,4 @@ obj-$(CONFIG_TEGRA_VDE)		+= tegra-vde/
 obj-$(CONFIG_VIDEO_ZORAN)	+= zoran/
 obj-$(CONFIG_VIDEO_ROCKCHIP_VPU) += rockchip/vpu/
 obj-$(CONFIG_VIDEO_IPU3_IMGU)	+= ipu3/
+obj-$(CONFIG_SOC_CAMERA)	+= soc_camera/
diff --git a/drivers/media/i2c/soc_camera/Kconfig b/drivers/staging/media/soc_camera/Kconfig
similarity index 74%
rename from drivers/media/i2c/soc_camera/Kconfig
rename to drivers/staging/media/soc_camera/Kconfig
index bcd9ef86f40b7..ebd78cebd4ecb 100644
--- a/drivers/media/i2c/soc_camera/Kconfig
+++ b/drivers/staging/media/soc_camera/Kconfig
@@ -1,3 +1,11 @@
+config SOC_CAMERA
+	tristate "SoC camera support"
+	depends on VIDEO_V4L2 && HAS_DMA && I2C
+	select VIDEOBUF2_CORE
+	help
+	  SoC Camera is a common API to several cameras, not connecting
+	  over a bus like PCI or USB. For example some i2c camera connected
+	  directly to the data bus of an SoC.
 comment "soc_camera sensor drivers"
 
 config SOC_CAMERA_MT9M111
diff --git a/drivers/media/i2c/soc_camera/Makefile b/drivers/staging/media/soc_camera/Makefile
similarity index 76%
rename from drivers/media/i2c/soc_camera/Makefile
rename to drivers/staging/media/soc_camera/Makefile
index 6d63eb31c3b7f..e03450cee5249 100644
--- a/drivers/media/i2c/soc_camera/Makefile
+++ b/drivers/staging/media/soc_camera/Makefile
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_SOC_CAMERA)		+= soc_camera.o soc_mediabus.o
 obj-$(CONFIG_SOC_CAMERA_MT9V022)	+= soc_mt9v022.o
 obj-$(CONFIG_SOC_CAMERA_OV5642)		+= soc_ov5642.o
 obj-$(CONFIG_SOC_CAMERA_OV9740)		+= soc_ov9740.o
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/staging/media/soc_camera/soc_camera.c
similarity index 100%
rename from drivers/media/platform/soc_camera/soc_camera.c
rename to drivers/staging/media/soc_camera/soc_camera.c
diff --git a/drivers/media/platform/soc_camera/soc_mediabus.c b/drivers/staging/media/soc_camera/soc_mediabus.c
similarity index 100%
rename from drivers/media/platform/soc_camera/soc_mediabus.c
rename to drivers/staging/media/soc_camera/soc_mediabus.c
diff --git a/drivers/media/i2c/soc_camera/soc_mt9v022.c b/drivers/staging/media/soc_camera/soc_mt9v022.c
similarity index 100%
rename from drivers/media/i2c/soc_camera/soc_mt9v022.c
rename to drivers/staging/media/soc_camera/soc_mt9v022.c
diff --git a/drivers/media/i2c/soc_camera/soc_ov5642.c b/drivers/staging/media/soc_camera/soc_ov5642.c
similarity index 100%
rename from drivers/media/i2c/soc_camera/soc_ov5642.c
rename to drivers/staging/media/soc_camera/soc_ov5642.c
diff --git a/drivers/media/i2c/soc_camera/soc_ov9740.c b/drivers/staging/media/soc_camera/soc_ov9740.c
similarity index 100%
rename from drivers/media/i2c/soc_camera/soc_ov9740.c
rename to drivers/staging/media/soc_camera/soc_ov9740.c
-- 
2.11.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 2/4] soc_camera: Move the imx074 under soc_camera directory
  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 ` Sakari Ailus
  2019-02-08  8:41 ` [PATCH 3/4] soc_camera: Move the mt9t031 " Sakari Ailus
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Sakari Ailus @ 2019-02-08  8:41 UTC (permalink / raw)
  To: linux-media; +Cc: hverkuil

Move the imx074 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/imx074/Kconfig                  | 5 -----
 drivers/staging/media/imx074/Makefile                 | 1 -
 drivers/staging/media/imx074/TODO                     | 5 -----
 drivers/staging/media/soc_camera/Kconfig              | 7 +++++++
 drivers/staging/media/soc_camera/Makefile             | 1 +
 drivers/staging/media/{imx074 => soc_camera}/imx074.c | 0
 8 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 drivers/staging/media/imx074/Kconfig
 delete mode 100644 drivers/staging/media/imx074/Makefile
 delete mode 100644 drivers/staging/media/imx074/TODO
 rename drivers/staging/media/{imx074 => soc_camera}/imx074.c (100%)

diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 7c3f443f27358..fce8933216241 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/imx074/Kconfig"
-
 source "drivers/staging/media/mt9t031/Kconfig"
 
 source "drivers/staging/media/omap4iss/Kconfig"
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 9c1bb862f5c92..74920289b0d94 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_IMX074)	+= imx074/
 obj-$(CONFIG_SOC_CAMERA_MT9T031)	+= mt9t031/
 obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/
 obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
diff --git a/drivers/staging/media/imx074/Kconfig b/drivers/staging/media/imx074/Kconfig
deleted file mode 100644
index 229cbeea580b0..0000000000000
--- a/drivers/staging/media/imx074/Kconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-config SOC_CAMERA_IMX074
-	tristate "imx074 support (DEPRECATED)"
-	depends on SOC_CAMERA && I2C
-	help
-	  This driver supports IMX074 cameras from Sony
diff --git a/drivers/staging/media/imx074/Makefile b/drivers/staging/media/imx074/Makefile
deleted file mode 100644
index 7d183574aa840..0000000000000
--- a/drivers/staging/media/imx074/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_SOC_CAMERA_IMX074)		+= imx074.o
diff --git a/drivers/staging/media/imx074/TODO b/drivers/staging/media/imx074/TODO
deleted file mode 100644
index 15580a4f950c5..0000000000000
--- a/drivers/staging/media/imx074/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-This sensor driver needs to be converted to a regular
-v4l2 subdev driver. The soc_camera framework is deprecated and
-will be removed in the future. Unless someone does this work this
-sensor driver will be deleted when the soc_camera framework is
-deleted.
diff --git a/drivers/staging/media/soc_camera/Kconfig b/drivers/staging/media/soc_camera/Kconfig
index ebd78cebd4ecb..e6bd04840971c 100644
--- a/drivers/staging/media/soc_camera/Kconfig
+++ b/drivers/staging/media/soc_camera/Kconfig
@@ -6,6 +6,7 @@ config SOC_CAMERA
 	  SoC Camera is a common API to several cameras, not connecting
 	  over a bus like PCI or USB. For example some i2c camera connected
 	  directly to the data bus of an SoC.
+
 comment "soc_camera sensor drivers"
 
 config SOC_CAMERA_MT9M111
@@ -35,3 +36,9 @@ config SOC_CAMERA_OV9740
 	depends on SOC_CAMERA && I2C
 	help
 	  This is a ov9740 camera driver
+
+config SOC_CAMERA_IMX074
+	tristate "imx074 support (DEPRECATED)"
+	depends on SOC_CAMERA && I2C
+	help
+	  This driver supports IMX074 cameras from Sony
diff --git a/drivers/staging/media/soc_camera/Makefile b/drivers/staging/media/soc_camera/Makefile
index e03450cee5249..09560dc32c4c7 100644
--- a/drivers/staging/media/soc_camera/Makefile
+++ b/drivers/staging/media/soc_camera/Makefile
@@ -3,3 +3,4 @@ obj-$(CONFIG_SOC_CAMERA)		+= soc_camera.o soc_mediabus.o
 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
diff --git a/drivers/staging/media/imx074/imx074.c b/drivers/staging/media/soc_camera/imx074.c
similarity index 100%
rename from drivers/staging/media/imx074/imx074.c
rename to drivers/staging/media/soc_camera/imx074.c
-- 
2.11.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 3/4] soc_camera: Move the mt9t031 under soc_camera directory
  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
  2019-02-08  8:41 ` [PATCH 4/4] soc_camera: Depend on BROKEN Sakari Ailus
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Sakari Ailus @ 2019-02-08  8:41 UTC (permalink / raw)
  To: linux-media; +Cc: hverkuil

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


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 4/4] soc_camera: Depend on BROKEN
  2019-02-08  8:41 [PATCH 0/4] Move SoC camera to staging, depend on BROKEN Sakari Ailus
                   ` (2 preceding siblings ...)
  2019-02-08  8:41 ` [PATCH 3/4] soc_camera: Move the mt9t031 " Sakari Ailus
@ 2019-02-08  8:41 ` 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
  5 siblings, 0 replies; 7+ messages in thread
From: Sakari Ailus @ 2019-02-08  8:41 UTC (permalink / raw)
  To: linux-media; +Cc: hverkuil

This patch makes the SoC camera framework as well as effectively the few
remaining sensor drivers depend on BROKEN, rendering it uncompileable
without changes in Kconfig.

The purpose is to leave the code around if someone wishes to convert the
drivers to the modern day V4L2 sub-device framework without having to go
to see development history in git.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 drivers/staging/media/soc_camera/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/media/soc_camera/Kconfig b/drivers/staging/media/soc_camera/Kconfig
index 6a6aa6d2d150e..bacd30f0348dc 100644
--- a/drivers/staging/media/soc_camera/Kconfig
+++ b/drivers/staging/media/soc_camera/Kconfig
@@ -1,6 +1,6 @@
 config SOC_CAMERA
 	tristate "SoC camera support"
-	depends on VIDEO_V4L2 && HAS_DMA && I2C
+	depends on VIDEO_V4L2 && HAS_DMA && I2C && BROKEN
 	select VIDEOBUF2_CORE
 	help
 	  SoC Camera is a common API to several cameras, not connecting
-- 
2.11.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH 0/4] Move SoC camera to staging, depend on BROKEN
  2019-02-08  8:41 [PATCH 0/4] Move SoC camera to staging, depend on BROKEN Sakari Ailus
                   ` (3 preceding siblings ...)
  2019-02-08  8:41 ` [PATCH 4/4] soc_camera: Depend on BROKEN Sakari Ailus
@ 2019-02-08  8:43 ` Sakari Ailus
  2019-02-08  8:52 ` Hans Verkuil
  5 siblings, 0 replies; 7+ messages in thread
From: Sakari Ailus @ 2019-02-08  8:43 UTC (permalink / raw)
  To: Sakari Ailus; +Cc: linux-media, hverkuil

On Fri, Feb 08, 2019 at 10:41:43AM +0200, Sakari Ailus wrote:
> Hi all,
> 
> This series moves the SoC camera framework and the remaining drivers under
> the staging tree and makes them depend on BROKEN.
> 
> The files could be later removed.
> 
> Sakari Ailus (4):
>   soc_camera: Move to the staging tree
>   soc_camera: Move the imx074 under soc_camera directory
>   soc_camera: Move the mt9t031 under soc_camera directory
>   soc_camera: Depend on BROKEN

Btw. the series depends on two previous patches I've posted under subject
"[PATCH 0/2] Remove more SoC camera sensor drivers".

-- 
Sakari Ailus

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH 0/4] Move SoC camera to staging, depend on BROKEN
  2019-02-08  8:41 [PATCH 0/4] Move SoC camera to staging, depend on BROKEN Sakari Ailus
                   ` (4 preceding siblings ...)
  2019-02-08  8:43 ` [PATCH 0/4] Move SoC camera to staging, depend " Sakari Ailus
@ 2019-02-08  8:52 ` Hans Verkuil
  5 siblings, 0 replies; 7+ messages in thread
From: Hans Verkuil @ 2019-02-08  8:52 UTC (permalink / raw)
  To: Sakari Ailus, linux-media

On 2/8/19 9:41 AM, Sakari Ailus wrote:
> Hi all,
> 
> This series moves the SoC camera framework and the remaining drivers under
> the staging tree and makes them depend on BROKEN.
> 
> The files could be later removed.

For this series:

Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

Thanks!

	Hans

> 
> Sakari Ailus (4):
>   soc_camera: Move to the staging tree
>   soc_camera: Move the imx074 under soc_camera directory
>   soc_camera: Move the mt9t031 under soc_camera directory
>   soc_camera: Depend on BROKEN
> 
>  drivers/media/i2c/Kconfig                           |  8 --------
>  drivers/media/i2c/Makefile                          |  1 -
>  drivers/media/platform/Kconfig                      |  1 -
>  drivers/media/platform/Makefile                     |  2 --
>  drivers/media/platform/soc_camera/Kconfig           |  8 --------
>  drivers/media/platform/soc_camera/Makefile          |  1 -
>  drivers/staging/media/Kconfig                       |  6 ++----
>  drivers/staging/media/Makefile                      |  3 +--
>  drivers/staging/media/imx074/Kconfig                |  5 -----
>  drivers/staging/media/imx074/Makefile               |  1 -
>  drivers/staging/media/imx074/TODO                   |  5 -----
>  .../{media/i2c => staging/media}/soc_camera/Kconfig | 21 +++++++++++++++++++++
>  .../i2c => staging/media}/soc_camera/Makefile       |  3 +++
>  .../staging/media/{imx074 => soc_camera}/imx074.c   |  0
>  .../staging/media/{mt9t031 => soc_camera}/mt9t031.c |  0
>  .../media}/soc_camera/soc_camera.c                  |  0
>  .../media}/soc_camera/soc_mediabus.c                |  0
>  .../i2c => staging/media}/soc_camera/soc_mt9v022.c  |  0
>  .../i2c => staging/media}/soc_camera/soc_ov5642.c   |  0
>  .../i2c => staging/media}/soc_camera/soc_ov9740.c   |  0
>  20 files changed, 27 insertions(+), 38 deletions(-)
>  delete mode 100644 drivers/media/platform/soc_camera/Kconfig
>  delete mode 100644 drivers/media/platform/soc_camera/Makefile
>  delete mode 100644 drivers/staging/media/imx074/Kconfig
>  delete mode 100644 drivers/staging/media/imx074/Makefile
>  delete mode 100644 drivers/staging/media/imx074/TODO
>  rename drivers/{media/i2c => staging/media}/soc_camera/Kconfig (57%)
>  rename drivers/{media/i2c => staging/media}/soc_camera/Makefile (55%)
>  rename drivers/staging/media/{imx074 => soc_camera}/imx074.c (100%)
>  rename drivers/staging/media/{mt9t031 => soc_camera}/mt9t031.c (100%)
>  rename drivers/{media/platform => staging/media}/soc_camera/soc_camera.c (100%)
>  rename drivers/{media/platform => staging/media}/soc_camera/soc_mediabus.c (100%)
>  rename drivers/{media/i2c => staging/media}/soc_camera/soc_mt9v022.c (100%)
>  rename drivers/{media/i2c => staging/media}/soc_camera/soc_ov5642.c (100%)
>  rename drivers/{media/i2c => staging/media}/soc_camera/soc_ov9740.c (100%)
> 


^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-02-08  8:52 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH 3/4] soc_camera: Move the mt9t031 " Sakari Ailus
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

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).