Move SoC camera to staging, depend on BROKEN
Subsystems (3)
cover Move SoC camera to staging, depend on BROKEN
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%)Signature · 1 line
2.11.0
PATCH 1/4 soc_camera: Move to the staging tree
The SoC camera framework has no functional drivers left, something that has not changed for years. Move the leftovers to the staging tree.
---
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%)drivers/media/i2c/Kconfig +0 -8
@@ -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
drivers/media/i2c/Makefile +0 -1
@@ -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
drivers/media/platform/Kconfig +0 -1
@@ -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"
drivers/media/platform/Makefile +0 -2
@@ -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
drivers/media/platform/soc_camera/Kconfig deleted +0 -8
@@ -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.
drivers/media/platform/soc_camera/Makefile deleted +0 -1
@@ -1 +0,0 @@ -obj-$(CONFIG_SOC_CAMERA) += soc_camera.o soc_mediabus.o
drivers/staging/media/Kconfig +2 -0
@@ -41,4 +41,6 @@ source "drivers/staging/media/zoran/Kconfig" source "drivers/staging/media/ipu3/Kconfig" +source "drivers/staging/media/soc_camera/Kconfig" + endif
drivers/staging/media/Makefile +1 -0
@@ -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/
drivers/staging/media/soc_camera/Kconfig renamed from drivers/media/i2c/soc_camera/Kconfig +8 -0
@@ -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
drivers/staging/media/soc_camera/Makefile renamed from drivers/media/i2c/soc_camera/Makefile +1 -0
@@ -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
drivers/staging/media/soc_camera/soc_camera.c renamed from drivers/media/platform/soc_camera/soc_camera.c +0 -0
drivers/staging/media/soc_camera/soc_mediabus.c renamed from drivers/media/platform/soc_camera/soc_mediabus.c +0 -0
drivers/staging/media/soc_camera/soc_mt9v022.c renamed from drivers/media/i2c/soc_camera/soc_mt9v022.c +0 -0
drivers/staging/media/soc_camera/soc_ov5642.c renamed from drivers/media/i2c/soc_camera/soc_ov5642.c +0 -0
drivers/staging/media/soc_camera/soc_ov9740.c renamed from drivers/media/i2c/soc_camera/soc_ov9740.c +0 -0
Signature · 1 line
2.11.0
PATCH 2/4 soc_camera: Move the imx074 under soc_camera directory
In reply to Sakari AilusMove the imx074 driver to the soc_camera directory in the media staging tree.
---
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%)drivers/staging/media/Kconfig +0 -2
@@ -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"
drivers/staging/media/Makefile +0 -1
@@ -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/
drivers/staging/media/imx074/Kconfig deleted +0 -5
@@ -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
drivers/staging/media/imx074/Makefile deleted +0 -1
@@ -1 +0,0 @@ -obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074.o
drivers/staging/media/imx074/TODO deleted +0 -5
@@ -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.
drivers/staging/media/soc_camera/Kconfig +7 -0
@@ -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
drivers/staging/media/soc_camera/Makefile +1 -0
@@ -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
drivers/staging/media/soc_camera/imx074.c renamed from drivers/staging/media/imx074/imx074.c +0 -0
Signature · 1 line
2.11.0
PATCH 3/4 soc_camera: Move the mt9t031 under soc_camera directory
In reply to Sakari AilusMove the mt9t031 driver to the soc_camera directory in the media staging tree.
---
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%)drivers/staging/media/Kconfig +0 -2
@@ -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"
drivers/staging/media/Makefile +0 -1
@@ -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/
drivers/staging/media/soc_camera/Kconfig +6 -0
@@ -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.
drivers/staging/media/soc_camera/Makefile +1 -0
@@ -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
drivers/staging/media/soc_camera/mt9t031.c renamed from drivers/staging/media/mt9t031/mt9t031.c +0 -0
Signature · 1 line
2.11.0
PATCH 4/4 soc_camera: Depend on BROKEN
In reply to Sakari AilusThis 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.
--- drivers/staging/media/soc_camera/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/soc_camera/Kconfig +1 -1
@@ -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
Signature · 1 line
2.11.0
Quoted 5 lines · Sakari Ailus
Hi all,
This series moves the SoC camera framework and the remaining drivers under the staging tree and makes them depend on BROKEN.
Quoted 7 lines
The files could be later removed.
Sakari Ailus (4):
soc_camera: Move to the staging tree
soc_camera: Move the imx074 undersoc_cameradirectory
soc_camera: Move the mt9t031 undersoc_cameradirectory
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".
Signature · 1 line
Sakari Ailus
Quoted 6 lines · Sakari Ailus
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:
Thanks!
Hans
Quoted 43 lines
Sakari Ailus (4):
soc_camera: Move to the staging tree
soc_camera: Move the imx074 undersoc_cameradirectory
soc_camera: Move the mt9t031 undersoc_cameradirectory
soc_camera: Depend on BROKENdrivers/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%)