soc_camera/omap1: move to staging in preparation for removal

PATCH In review Hans Verkuil 2 participants 7 messages Feb 23, 2016

Subsystems (2)

Media (V4L/DVB) Staging

lore

Share & tools

lore

Hans Verkuil

author

2016-02-23 12:13 UTC #0 lore raw

PATCH 1/1 soc_camera/omap1: move to staging in preparation for removal

This driver is deprecated: it needs to be converted to vb2 and it should become a stand-alone driver instead of using the soc-camera framework.

Unless someone is willing to take this on (unlikely with such ancient hardware) it is going to be removed from the kernel soon.

Signed-off-by Hans Verkuil <[email protected]>

---
 drivers/media/platform/soc_camera/Kconfig                   | 10 ----------
 drivers/media/platform/soc_camera/Makefile                  |  1 -
 drivers/staging/media/Kconfig                               |  2 ++
 drivers/staging/media/Makefile                              |  1 +
 drivers/staging/media/omap1/Kconfig                         | 13 +++++++++++++
 drivers/staging/media/omap1/Makefile                        |  3 +++
 .../soc_camera => staging/media/omap1}/omap1_camera.c       |  0
 7 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 drivers/staging/media/omap1/Kconfig
 create mode 100644 drivers/staging/media/omap1/Makefile
 rename drivers/{media/platform/soc_camera => staging/media/omap1}/omap1_camera.c (100%)

drivers/media/platform/soc_camera/Kconfig +0 ~~-10~~

index f2776cd..954dd36 100644
@@ -60,16 +60,6 @@ config VIDEO_SH_MOBILE_CEU
 	---help---
 	  This is a v4l2 driver for the SuperH Mobile CEU Interface
 
-config VIDEO_OMAP1
-	tristate "OMAP1 Camera Interface driver"
-	depends on VIDEO_DEV && SOC_CAMERA
-	depends on ARCH_OMAP1
-	depends on HAS_DMA
-	select VIDEOBUF_DMA_CONTIG
-	select VIDEOBUF_DMA_SG
-	---help---
-	  This is a v4l2 driver for the TI OMAP1 camera interface
-
 config VIDEO_MX2
 	tristate "i.MX27 Camera Sensor Interface driver"
 	depends on VIDEO_DEV && SOC_CAMERA

drivers/media/platform/soc_camera/Makefile +0 -1

index 2826382..bdd7fc9 100644
@@ -9,7 +9,6 @@ obj-$(CONFIG_SOC_CAMERA_PLATFORM)	+= soc_camera_platform.o
 obj-$(CONFIG_VIDEO_ATMEL_ISI)		+= atmel-isi.o
 obj-$(CONFIG_VIDEO_MX2)			+= mx2_camera.o
 obj-$(CONFIG_VIDEO_MX3)			+= mx3_camera.o
-obj-$(CONFIG_VIDEO_OMAP1)		+= omap1_camera.o
 obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)	+= sh_mobile_ceu_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CSI2)	+= sh_mobile_csi2.o

drivers/staging/media/Kconfig +2 -0

index d48a5c2..382d868 100644
@@ -29,6 +29,8 @@ source "drivers/staging/media/mn88472/Kconfig"
 
 source "drivers/staging/media/mn88473/Kconfig"
 
+source "drivers/staging/media/omap1/Kconfig"
+
 source "drivers/staging/media/omap4iss/Kconfig"
 
 source "drivers/staging/media/timb/Kconfig"

drivers/staging/media/Makefile +1 -0

index fb94f04..89d038c 100644
@@ -2,6 +2,7 @@ obj-$(CONFIG_I2C_BCM2048)	+= bcm2048/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/
 obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/
+obj-$(CONFIG_VIDEO_OMAP1)	+= omap1/
 obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
 obj-$(CONFIG_DVB_MN88472)       += mn88472/
 obj-$(CONFIG_DVB_MN88473)       += mn88473/

drivers/staging/media/omap1/Kconfig new file +13 -0

new file mode 100644
index 0000000..6cfab3a
@@ -0,0 +1,13 @@
+config VIDEO_OMAP1
+	tristate "OMAP1 Camera Interface driver"
+	depends on VIDEO_DEV && SOC_CAMERA
+	depends on ARCH_OMAP1
+	depends on HAS_DMA
+	select VIDEOBUF_DMA_CONTIG
+	select VIDEOBUF_DMA_SG
+	---help---
+	  This is a v4l2 driver for the TI OMAP1 camera interface
+
+	  This driver is deprecated and will be removed soon unless someone
+	  will start the work to convert this driver to the vb2 framework
+	  and remove the soc-camera dependency.

drivers/staging/media/omap1/Makefile new file +3 -0

new file mode 100644
index 0000000..2885622
@@ -0,0 +1,3 @@
+# Makefile for OMAP1 driver
+
+obj-$(CONFIG_VIDEO_OMAP1) += omap1_camera.o

drivers/staging/media/omap1/omap1_camera.c renamed from drivers/media/platform/soc_camera/omap1_camera.c +0 -0

similarity index 100%
rename from drivers/media/platform/soc_camera/omap1_camera.c
rename to drivers/staging/media/omap1/omap1_camera.c

Signature · 1 line

2.7.0

Guennadi Liakhovetski

Acked-by on v1 1/1

2016-02-23 14:55 UTC #1 lore raw

Hi Hans,

Quoted 9 lines · Hans Verkuil

This driver is deprecated: it needs to be converted to vb2 and it should become a stand-alone driver instead of using the soc-camera framework.
Unless someone is willing to take this on (unlikely with such ancient hardware) it is going to be removed from the kernel soon.
Signed-off-by Hans Verkuil <[email protected]>

I guess I won't be pulling this through my tree, right?

Acked-by Guennadi Liakhovetski <[email protected]>

Thanks
Guennadi

Quoted 106 lines

---
 drivers/media/platform/soc_camera/Kconfig                   | 10 ----------
 drivers/media/platform/soc_camera/Makefile                  |  1 -
 drivers/staging/media/Kconfig                               |  2 ++
 drivers/staging/media/Makefile                              |  1 +
 drivers/staging/media/omap1/Kconfig                         | 13 +++++++++++++
 drivers/staging/media/omap1/Makefile                        |  3 +++
 .../soc_camera => staging/media/omap1}/omap1_camera.c       |  0
 7 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 drivers/staging/media/omap1/Kconfig
 create mode 100644 drivers/staging/media/omap1/Makefile
 rename drivers/{media/platform/soc_camera => staging/media/omap1}/omap1_camera.c (100%)

drivers/media/platform/soc_camera/Kconfig +0 ~~-10~~

index f2776cd..954dd36 100644
@@ -60,16 +60,6 @@ config VIDEO_SH_MOBILE_CEU
 	---help---
 	  This is a v4l2 driver for the SuperH Mobile CEU Interface
 
-config VIDEO_OMAP1
-	tristate "OMAP1 Camera Interface driver"
-	depends on VIDEO_DEV && SOC_CAMERA
-	depends on ARCH_OMAP1
-	depends on HAS_DMA
-	select VIDEOBUF_DMA_CONTIG
-	select VIDEOBUF_DMA_SG
-	---help---
-	  This is a v4l2 driver for the TI OMAP1 camera interface
-
 config VIDEO_MX2
 	tristate "i.MX27 Camera Sensor Interface driver"
 	depends on VIDEO_DEV && SOC_CAMERA

drivers/media/platform/soc_camera/Makefile +0 -1

index 2826382..bdd7fc9 100644
@@ -9,7 +9,6 @@ obj-$(CONFIG_SOC_CAMERA_PLATFORM)	+= soc_camera_platform.o
 obj-$(CONFIG_VIDEO_ATMEL_ISI)		+= atmel-isi.o
 obj-$(CONFIG_VIDEO_MX2)			+= mx2_camera.o
 obj-$(CONFIG_VIDEO_MX3)			+= mx3_camera.o
-obj-$(CONFIG_VIDEO_OMAP1)		+= omap1_camera.o
 obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)	+= sh_mobile_ceu_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CSI2)	+= sh_mobile_csi2.o

drivers/staging/media/Kconfig +2 -0

index d48a5c2..382d868 100644
@@ -29,6 +29,8 @@ source "drivers/staging/media/mn88472/Kconfig"
 
 source "drivers/staging/media/mn88473/Kconfig"
 
+source "drivers/staging/media/omap1/Kconfig"
+
 source "drivers/staging/media/omap4iss/Kconfig"
 
 source "drivers/staging/media/timb/Kconfig"

drivers/staging/media/Makefile +1 -0

index fb94f04..89d038c 100644
@@ -2,6 +2,7 @@ obj-$(CONFIG_I2C_BCM2048)	+= bcm2048/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/
 obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/
+obj-$(CONFIG_VIDEO_OMAP1)	+= omap1/
 obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
 obj-$(CONFIG_DVB_MN88472)       += mn88472/
 obj-$(CONFIG_DVB_MN88473)       += mn88473/

drivers/staging/media/omap1/Kconfig new file +13 -0

new file mode 100644
index 0000000..6cfab3a
@@ -0,0 +1,13 @@
+config VIDEO_OMAP1
+	tristate "OMAP1 Camera Interface driver"
+	depends on VIDEO_DEV && SOC_CAMERA
+	depends on ARCH_OMAP1
+	depends on HAS_DMA
+	select VIDEOBUF_DMA_CONTIG
+	select VIDEOBUF_DMA_SG
+	---help---
+	  This is a v4l2 driver for the TI OMAP1 camera interface
+
+	  This driver is deprecated and will be removed soon unless someone
+	  will start the work to convert this driver to the vb2 framework
+	  and remove the soc-camera dependency.

drivers/staging/media/omap1/Makefile new file +3 -0

new file mode 100644
index 0000000..2885622
@@ -0,0 +1,3 @@
+# Makefile for OMAP1 driver
+
+obj-$(CONFIG_VIDEO_OMAP1) += omap1_camera.o

drivers/staging/media/omap1/omap1_camera.c renamed from drivers/media/platform/soc_camera/omap1_camera.c +0 -0

similarity index 100%
rename from drivers/media/platform/soc_camera/omap1_camera.c
rename to drivers/staging/media/omap1/omap1_camera.c

Signature · 1 line

2.7.0

Hans Verkuil

author

2016-02-23 14:59 UTC #2 lore raw

Quoted 8 lines · Guennadi Liakhovetski

Hi Hans,
Quoted 4 lines · Hans Verkuil
This driver is deprecated: it needs to be converted to vb2 and it should become a stand-alone driver instead of using the soc-camera framework.

Quoted 7 lines

Quoted 5 lines
Unless someone is willing to take this on (unlikely with such ancient hardware) it is going to be removed from the kernel soon.
Signed-off-by Hans Verkuil <[email protected]>
I guess I won't be pulling this through my tree, right?

Right.

Quoted 2 lines

Acked-by Guennadi Liakhovetski <[email protected]>

Thanks!

This one was easy.

For the sh renesas drivers I will take one final look during the weekend. See what works and what doesn't. I actually have hardware for it, after all.

Regards,

Hans

Quoted 115 lines

Thanks
Guennadi

Quoted 106 lines

---
 drivers/media/platform/soc_camera/Kconfig                   | 10 ----------
 drivers/media/platform/soc_camera/Makefile                  |  1 -
 drivers/staging/media/Kconfig                               |  2 ++
 drivers/staging/media/Makefile                              |  1 +
 drivers/staging/media/omap1/Kconfig                         | 13 +++++++++++++
 drivers/staging/media/omap1/Makefile                        |  3 +++
 .../soc_camera => staging/media/omap1}/omap1_camera.c       |  0
 7 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 drivers/staging/media/omap1/Kconfig
 create mode 100644 drivers/staging/media/omap1/Makefile
 rename drivers/{media/platform/soc_camera => staging/media/omap1}/omap1_camera.c (100%)

drivers/media/platform/soc_camera/Kconfig +0 ~~-10~~

index f2776cd..954dd36 100644
@@ -60,16 +60,6 @@ config VIDEO_SH_MOBILE_CEU
 	---help---
 	  This is a v4l2 driver for the SuperH Mobile CEU Interface
 
-config VIDEO_OMAP1
-	tristate "OMAP1 Camera Interface driver"
-	depends on VIDEO_DEV && SOC_CAMERA
-	depends on ARCH_OMAP1
-	depends on HAS_DMA
-	select VIDEOBUF_DMA_CONTIG
-	select VIDEOBUF_DMA_SG
-	---help---
-	  This is a v4l2 driver for the TI OMAP1 camera interface
-
 config VIDEO_MX2
 	tristate "i.MX27 Camera Sensor Interface driver"
 	depends on VIDEO_DEV && SOC_CAMERA

drivers/media/platform/soc_camera/Makefile +0 -1

index 2826382..bdd7fc9 100644
@@ -9,7 +9,6 @@ obj-$(CONFIG_SOC_CAMERA_PLATFORM)	+= soc_camera_platform.o
 obj-$(CONFIG_VIDEO_ATMEL_ISI)		+= atmel-isi.o
 obj-$(CONFIG_VIDEO_MX2)			+= mx2_camera.o
 obj-$(CONFIG_VIDEO_MX3)			+= mx3_camera.o
-obj-$(CONFIG_VIDEO_OMAP1)		+= omap1_camera.o
 obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)	+= sh_mobile_ceu_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CSI2)	+= sh_mobile_csi2.o

drivers/staging/media/Kconfig +2 -0

index d48a5c2..382d868 100644
@@ -29,6 +29,8 @@ source "drivers/staging/media/mn88472/Kconfig"
 
 source "drivers/staging/media/mn88473/Kconfig"
 
+source "drivers/staging/media/omap1/Kconfig"
+
 source "drivers/staging/media/omap4iss/Kconfig"
 
 source "drivers/staging/media/timb/Kconfig"

drivers/staging/media/Makefile +1 -0

index fb94f04..89d038c 100644
@@ -2,6 +2,7 @@ obj-$(CONFIG_I2C_BCM2048)	+= bcm2048/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/
 obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/
+obj-$(CONFIG_VIDEO_OMAP1)	+= omap1/
 obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
 obj-$(CONFIG_DVB_MN88472)       += mn88472/
 obj-$(CONFIG_DVB_MN88473)       += mn88473/

drivers/staging/media/omap1/Kconfig new file +13 -0

new file mode 100644
index 0000000..6cfab3a
@@ -0,0 +1,13 @@
+config VIDEO_OMAP1
+	tristate "OMAP1 Camera Interface driver"
+	depends on VIDEO_DEV && SOC_CAMERA
+	depends on ARCH_OMAP1
+	depends on HAS_DMA
+	select VIDEOBUF_DMA_CONTIG
+	select VIDEOBUF_DMA_SG
+	---help---
+	  This is a v4l2 driver for the TI OMAP1 camera interface
+
+	  This driver is deprecated and will be removed soon unless someone
+	  will start the work to convert this driver to the vb2 framework
+	  and remove the soc-camera dependency.

drivers/staging/media/omap1/Makefile new file +3 -0

new file mode 100644
index 0000000..2885622
@@ -0,0 +1,3 @@
+# Makefile for OMAP1 driver
+
+obj-$(CONFIG_VIDEO_OMAP1) += omap1_camera.o

drivers/staging/media/omap1/omap1_camera.c renamed from drivers/media/platform/soc_camera/omap1_camera.c +0 -0

similarity index 100%
rename from drivers/media/platform/soc_camera/omap1_camera.c
rename to drivers/staging/media/omap1/omap1_camera.c

Signature · 1 line

2.7.0

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Guennadi Liakhovetski

2016-02-23 15:05 UTC #3 lore raw

Quoted 17 lines · Hans Verkuil

Quoted 8 lines · Guennadi Liakhovetski
Hi Hans,
Quoted 4 lines · Hans Verkuil
This driver is deprecated: it needs to be converted to vb2 and it should become a stand-alone driver instead of using the soc-camera framework.
Quoted 7 lines
Quoted 5 lines
Unless someone is willing to take this on (unlikely with such ancient hardware) it is going to be removed from the kernel soon.
Signed-off-by Hans Verkuil <[email protected]>
I guess I won't be pulling this through my tree, right?

Quoted 8 lines

Right.
Quoted 2 lines
Acked-by Guennadi Liakhovetski <[email protected]>
Thanks!
This one was easy.

mx2, mx3 should be easy too?

Guennadi

Quoted 124 lines

For the sh renesas drivers I will take one final look during the weekend. See what works and what doesn't. I actually have hardware for it, after all.

Regards,

Hans

Quoted 115 lines

Thanks
Guennadi

Quoted 106 lines

---
 drivers/media/platform/soc_camera/Kconfig                   | 10 ----------
 drivers/media/platform/soc_camera/Makefile                  |  1 -
 drivers/staging/media/Kconfig                               |  2 ++
 drivers/staging/media/Makefile                              |  1 +
 drivers/staging/media/omap1/Kconfig                         | 13 +++++++++++++
 drivers/staging/media/omap1/Makefile                        |  3 +++
 .../soc_camera => staging/media/omap1}/omap1_camera.c       |  0
 7 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 drivers/staging/media/omap1/Kconfig
 create mode 100644 drivers/staging/media/omap1/Makefile
 rename drivers/{media/platform/soc_camera => staging/media/omap1}/omap1_camera.c (100%)

drivers/media/platform/soc_camera/Kconfig +0 ~~-10~~

index f2776cd..954dd36 100644
@@ -60,16 +60,6 @@ config VIDEO_SH_MOBILE_CEU
 	---help---
 	  This is a v4l2 driver for the SuperH Mobile CEU Interface
 
-config VIDEO_OMAP1
-	tristate "OMAP1 Camera Interface driver"
-	depends on VIDEO_DEV && SOC_CAMERA
-	depends on ARCH_OMAP1
-	depends on HAS_DMA
-	select VIDEOBUF_DMA_CONTIG
-	select VIDEOBUF_DMA_SG
-	---help---
-	  This is a v4l2 driver for the TI OMAP1 camera interface
-
 config VIDEO_MX2
 	tristate "i.MX27 Camera Sensor Interface driver"
 	depends on VIDEO_DEV && SOC_CAMERA

drivers/media/platform/soc_camera/Makefile +0 -1

index 2826382..bdd7fc9 100644
@@ -9,7 +9,6 @@ obj-$(CONFIG_SOC_CAMERA_PLATFORM)	+= soc_camera_platform.o
 obj-$(CONFIG_VIDEO_ATMEL_ISI)		+= atmel-isi.o
 obj-$(CONFIG_VIDEO_MX2)			+= mx2_camera.o
 obj-$(CONFIG_VIDEO_MX3)			+= mx3_camera.o
-obj-$(CONFIG_VIDEO_OMAP1)		+= omap1_camera.o
 obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)	+= sh_mobile_ceu_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CSI2)	+= sh_mobile_csi2.o

drivers/staging/media/Kconfig +2 -0

index d48a5c2..382d868 100644
@@ -29,6 +29,8 @@ source "drivers/staging/media/mn88472/Kconfig"
 
 source "drivers/staging/media/mn88473/Kconfig"
 
+source "drivers/staging/media/omap1/Kconfig"
+
 source "drivers/staging/media/omap4iss/Kconfig"
 
 source "drivers/staging/media/timb/Kconfig"

drivers/staging/media/Makefile +1 -0

index fb94f04..89d038c 100644
@@ -2,6 +2,7 @@ obj-$(CONFIG_I2C_BCM2048)	+= bcm2048/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/
 obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/
+obj-$(CONFIG_VIDEO_OMAP1)	+= omap1/
 obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
 obj-$(CONFIG_DVB_MN88472)       += mn88472/
 obj-$(CONFIG_DVB_MN88473)       += mn88473/

drivers/staging/media/omap1/Kconfig new file +13 -0

new file mode 100644
index 0000000..6cfab3a
@@ -0,0 +1,13 @@
+config VIDEO_OMAP1
+	tristate "OMAP1 Camera Interface driver"
+	depends on VIDEO_DEV && SOC_CAMERA
+	depends on ARCH_OMAP1
+	depends on HAS_DMA
+	select VIDEOBUF_DMA_CONTIG
+	select VIDEOBUF_DMA_SG
+	---help---
+	  This is a v4l2 driver for the TI OMAP1 camera interface
+
+	  This driver is deprecated and will be removed soon unless someone
+	  will start the work to convert this driver to the vb2 framework
+	  and remove the soc-camera dependency.

drivers/staging/media/omap1/Makefile new file +3 -0

new file mode 100644
index 0000000..2885622
@@ -0,0 +1,3 @@
+# Makefile for OMAP1 driver
+
+obj-$(CONFIG_VIDEO_OMAP1) += omap1_camera.o

drivers/staging/media/omap1/omap1_camera.c renamed from drivers/media/platform/soc_camera/omap1_camera.c +0 -0

similarity index 100%
rename from drivers/media/platform/soc_camera/omap1_camera.c
rename to drivers/staging/media/omap1/omap1_camera.c

Signature · 1 line

2.7.0

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Hans Verkuil

author

2016-02-23 15:56 UTC #4 lore raw

Quoted 22 lines · Guennadi Liakhovetski

Quoted 20 lines · Hans Verkuil
Quoted 8 lines · Guennadi Liakhovetski
Hi Hans,
Quoted 4 lines · Hans Verkuil
This driver is deprecated: it needs to be converted to vb2 and it should become a stand-alone driver instead of using the soc-camera framework.
Quoted 7 lines
Quoted 5 lines
Unless someone is willing to take this on (unlikely with such ancient hardware) it is going to be removed from the kernel soon.
Signed-off-by Hans Verkuil <[email protected]>
I guess I won't be pulling this through my tree, right?
Right.
Quoted 1 line

Quoted 7 lines

Quoted 5 lines
Quoted 1 line
Acked-by Guennadi Liakhovetski <[email protected]>
Thanks!
This one was easy.
mx2, mx3 should be easy too?

Sure. Are you certain these can be deprecated? I haven't heard anything regarding the status of these driver. You probably know that best.

If you give me the go ahead, then I'll prepare patches for these to move them to staging.

Regards,

Hans

Quoted 132 lines

Guennadi

Quoted 4 lines

For the sh renesas drivers I will take one final look during the weekend. See what works and what doesn't. I actually have hardware for it, after all.

Quoted 120 lines

Regards,

Hans

Quoted 115 lines

Thanks
Guennadi

Quoted 106 lines

---
 drivers/media/platform/soc_camera/Kconfig                   | 10 ----------
 drivers/media/platform/soc_camera/Makefile                  |  1 -
 drivers/staging/media/Kconfig                               |  2 ++
 drivers/staging/media/Makefile                              |  1 +
 drivers/staging/media/omap1/Kconfig                         | 13 +++++++++++++
 drivers/staging/media/omap1/Makefile                        |  3 +++
 .../soc_camera => staging/media/omap1}/omap1_camera.c       |  0
 7 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 drivers/staging/media/omap1/Kconfig
 create mode 100644 drivers/staging/media/omap1/Makefile
 rename drivers/{media/platform/soc_camera => staging/media/omap1}/omap1_camera.c (100%)

drivers/media/platform/soc_camera/Kconfig +0 ~~-10~~

index f2776cd..954dd36 100644
@@ -60,16 +60,6 @@ config VIDEO_SH_MOBILE_CEU
 	---help---
 	  This is a v4l2 driver for the SuperH Mobile CEU Interface
 
-config VIDEO_OMAP1
-	tristate "OMAP1 Camera Interface driver"
-	depends on VIDEO_DEV && SOC_CAMERA
-	depends on ARCH_OMAP1
-	depends on HAS_DMA
-	select VIDEOBUF_DMA_CONTIG
-	select VIDEOBUF_DMA_SG
-	---help---
-	  This is a v4l2 driver for the TI OMAP1 camera interface
-
 config VIDEO_MX2
 	tristate "i.MX27 Camera Sensor Interface driver"
 	depends on VIDEO_DEV && SOC_CAMERA

drivers/media/platform/soc_camera/Makefile +0 -1

index 2826382..bdd7fc9 100644
@@ -9,7 +9,6 @@ obj-$(CONFIG_SOC_CAMERA_PLATFORM)	+= soc_camera_platform.o
 obj-$(CONFIG_VIDEO_ATMEL_ISI)		+= atmel-isi.o
 obj-$(CONFIG_VIDEO_MX2)			+= mx2_camera.o
 obj-$(CONFIG_VIDEO_MX3)			+= mx3_camera.o
-obj-$(CONFIG_VIDEO_OMAP1)		+= omap1_camera.o
 obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)	+= sh_mobile_ceu_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CSI2)	+= sh_mobile_csi2.o

drivers/staging/media/Kconfig +2 -0

index d48a5c2..382d868 100644
@@ -29,6 +29,8 @@ source "drivers/staging/media/mn88472/Kconfig"
 
 source "drivers/staging/media/mn88473/Kconfig"
 
+source "drivers/staging/media/omap1/Kconfig"
+
 source "drivers/staging/media/omap4iss/Kconfig"
 
 source "drivers/staging/media/timb/Kconfig"

drivers/staging/media/Makefile +1 -0

index fb94f04..89d038c 100644
@@ -2,6 +2,7 @@ obj-$(CONFIG_I2C_BCM2048)	+= bcm2048/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/
 obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/
+obj-$(CONFIG_VIDEO_OMAP1)	+= omap1/
 obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
 obj-$(CONFIG_DVB_MN88472)       += mn88472/
 obj-$(CONFIG_DVB_MN88473)       += mn88473/

drivers/staging/media/omap1/Kconfig new file +13 -0

new file mode 100644
index 0000000..6cfab3a
@@ -0,0 +1,13 @@
+config VIDEO_OMAP1
+	tristate "OMAP1 Camera Interface driver"
+	depends on VIDEO_DEV && SOC_CAMERA
+	depends on ARCH_OMAP1
+	depends on HAS_DMA
+	select VIDEOBUF_DMA_CONTIG
+	select VIDEOBUF_DMA_SG
+	---help---
+	  This is a v4l2 driver for the TI OMAP1 camera interface
+
+	  This driver is deprecated and will be removed soon unless someone
+	  will start the work to convert this driver to the vb2 framework
+	  and remove the soc-camera dependency.

drivers/staging/media/omap1/Makefile new file +3 -0

new file mode 100644
index 0000000..2885622
@@ -0,0 +1,3 @@
+# Makefile for OMAP1 driver
+
+obj-$(CONFIG_VIDEO_OMAP1) += omap1_camera.o

drivers/staging/media/omap1/omap1_camera.c renamed from drivers/media/platform/soc_camera/omap1_camera.c +0 -0

similarity index 100%
rename from drivers/media/platform/soc_camera/omap1_camera.c
rename to drivers/staging/media/omap1/omap1_camera.c

Signature · 1 line

2.7.0

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Guennadi Liakhovetski

2016-02-23 16:04 UTC #5 lore raw

Quoted 29 lines · Hans Verkuil

Quoted 28 lines · Guennadi Liakhovetski
Quoted 25 lines · Hans Verkuil
Quoted 8 lines · Guennadi Liakhovetski
Hi Hans,
Quoted 4 lines · Hans Verkuil
This driver is deprecated: it needs to be converted to vb2 and it should become a stand-alone driver instead of using the soc-camera framework.
Quoted 7 lines
Quoted 5 lines
Unless someone is willing to take this on (unlikely with such ancient hardware) it is going to be removed from the kernel soon.
Signed-off-by Hans Verkuil <[email protected]>
I guess I won't be pulling this through my tree, right?
Right.
Quoted 2 lines
Acked-by Guennadi Liakhovetski <[email protected]>
Thanks!
This one was easy.

Quoted 8 lines

Quoted 1 line
mx2, mx3 should be easy too?
Sure. Are you certain these can be deprecated? I haven't heard anything regarding the status of these driver. You probably know that best.
If you give me the go ahead, then I'll prepare patches for these to move them to staging.

I asked pengutronix guys, they don't care about them any more. We had someone from freescale on CC in the original discussion, they didn't report back either, so... Up to you really, I'd put the probability of someone coming forward with a strong enough case to keep them at 4% :-) Is it good enough for you to prepare that patch?

Thanks
Guennadi

Quoted 137 lines

Regards,

Hans

Quoted 132 lines

Guennadi

Quoted 4 lines

For the sh renesas drivers I will take one final look during the weekend. See what works and what doesn't. I actually have hardware for it, after all.

Quoted 120 lines

Regards,

Hans

Quoted 115 lines

Thanks
Guennadi

Quoted 106 lines

---
 drivers/media/platform/soc_camera/Kconfig                   | 10 ----------
 drivers/media/platform/soc_camera/Makefile                  |  1 -
 drivers/staging/media/Kconfig                               |  2 ++
 drivers/staging/media/Makefile                              |  1 +
 drivers/staging/media/omap1/Kconfig                         | 13 +++++++++++++
 drivers/staging/media/omap1/Makefile                        |  3 +++
 .../soc_camera => staging/media/omap1}/omap1_camera.c       |  0
 7 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 drivers/staging/media/omap1/Kconfig
 create mode 100644 drivers/staging/media/omap1/Makefile
 rename drivers/{media/platform/soc_camera => staging/media/omap1}/omap1_camera.c (100%)

drivers/media/platform/soc_camera/Kconfig +0 ~~-10~~

index f2776cd..954dd36 100644
@@ -60,16 +60,6 @@ config VIDEO_SH_MOBILE_CEU
 	---help---
 	  This is a v4l2 driver for the SuperH Mobile CEU Interface
 
-config VIDEO_OMAP1
-	tristate "OMAP1 Camera Interface driver"
-	depends on VIDEO_DEV && SOC_CAMERA
-	depends on ARCH_OMAP1
-	depends on HAS_DMA
-	select VIDEOBUF_DMA_CONTIG
-	select VIDEOBUF_DMA_SG
-	---help---
-	  This is a v4l2 driver for the TI OMAP1 camera interface
-
 config VIDEO_MX2
 	tristate "i.MX27 Camera Sensor Interface driver"
 	depends on VIDEO_DEV && SOC_CAMERA

drivers/media/platform/soc_camera/Makefile +0 -1

index 2826382..bdd7fc9 100644
@@ -9,7 +9,6 @@ obj-$(CONFIG_SOC_CAMERA_PLATFORM)	+= soc_camera_platform.o
 obj-$(CONFIG_VIDEO_ATMEL_ISI)		+= atmel-isi.o
 obj-$(CONFIG_VIDEO_MX2)			+= mx2_camera.o
 obj-$(CONFIG_VIDEO_MX3)			+= mx3_camera.o
-obj-$(CONFIG_VIDEO_OMAP1)		+= omap1_camera.o
 obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)	+= sh_mobile_ceu_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CSI2)	+= sh_mobile_csi2.o

drivers/staging/media/Kconfig +2 -0

index d48a5c2..382d868 100644
@@ -29,6 +29,8 @@ source "drivers/staging/media/mn88472/Kconfig"
 
 source "drivers/staging/media/mn88473/Kconfig"
 
+source "drivers/staging/media/omap1/Kconfig"
+
 source "drivers/staging/media/omap4iss/Kconfig"
 
 source "drivers/staging/media/timb/Kconfig"

drivers/staging/media/Makefile +1 -0

index fb94f04..89d038c 100644
@@ -2,6 +2,7 @@ obj-$(CONFIG_I2C_BCM2048)	+= bcm2048/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/
 obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/
+obj-$(CONFIG_VIDEO_OMAP1)	+= omap1/
 obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
 obj-$(CONFIG_DVB_MN88472)       += mn88472/
 obj-$(CONFIG_DVB_MN88473)       += mn88473/

drivers/staging/media/omap1/Kconfig new file +13 -0

new file mode 100644
index 0000000..6cfab3a
@@ -0,0 +1,13 @@
+config VIDEO_OMAP1
+	tristate "OMAP1 Camera Interface driver"
+	depends on VIDEO_DEV && SOC_CAMERA
+	depends on ARCH_OMAP1
+	depends on HAS_DMA
+	select VIDEOBUF_DMA_CONTIG
+	select VIDEOBUF_DMA_SG
+	---help---
+	  This is a v4l2 driver for the TI OMAP1 camera interface
+
+	  This driver is deprecated and will be removed soon unless someone
+	  will start the work to convert this driver to the vb2 framework
+	  and remove the soc-camera dependency.

drivers/staging/media/omap1/Makefile new file +3 -0

new file mode 100644
index 0000000..2885622
@@ -0,0 +1,3 @@
+# Makefile for OMAP1 driver
+
+obj-$(CONFIG_VIDEO_OMAP1) += omap1_camera.o

drivers/staging/media/omap1/omap1_camera.c renamed from drivers/media/platform/soc_camera/omap1_camera.c +0 -0

similarity index 100%
rename from drivers/media/platform/soc_camera/omap1_camera.c
rename to drivers/staging/media/omap1/omap1_camera.c

Signature · 1 line

2.7.0

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Hans Verkuil

author

2016-02-23 16:09 UTC #6 lore raw

Quoted 37 lines · Guennadi Liakhovetski

Quoted 35 lines · Hans Verkuil
Quoted 22 lines · Guennadi Liakhovetski
Quoted 20 lines · Hans Verkuil
Quoted 8 lines · Guennadi Liakhovetski
Hi Hans,
Quoted 4 lines · Hans Verkuil
This driver is deprecated: it needs to be converted to vb2 and it should become a stand-alone driver instead of using the soc-camera framework.
Quoted 7 lines
Quoted 5 lines
Unless someone is willing to take this on (unlikely with such ancient hardware) it is going to be removed from the kernel soon.
Signed-off-by Hans Verkuil <[email protected]>
I guess I won't be pulling this through my tree, right?
Right.
Quoted 1 line
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Acked-by Guennadi Liakhovetski <[email protected]>
Thanks!
This one was easy.
mx2, mx3 should be easy too?
Sure. Are you certain these can be deprecated? I haven't heard anything regarding the status of these driver. You probably know that best.

Quoted 8 lines

Quoted 2 lines
If you give me the go ahead, then I'll prepare patches for these to move them to staging.
I asked pengutronix guys, they don't care about them any more. We had someone from freescale on CC in the original discussion, they didn't report back either, so... Up to you really, I'd put the probability of someone coming forward with a strong enough case to keep them at 4% :-) Is it good enough for you to prepare that patch?

Yes, that's good enough. It's not as if we remove it right away, it'll be in staging for a while.

Thanks for the info,

Hans