Re: [PATCH 12/34] media: mx1_camera: remove the driver
On Tue, Sep 18, 2012 at 09:13:54AM +, Arnd Bergmann wrote: On Tuesday 18 September 2012, Shawn Guo wrote: On Mon, Sep 17, 2012 at 10:33:25AM +0200, Guennadi Liakhovetski wrote: Ok, it used to compile not-so-long-ago, but it doesn't seem to be cared for a lot lately. Let's give Paulius a bit more time to react to this mail, otherwise I'll have no objections. Just as an idea, to make it a bit milder we could first mark it BROKEN and add to remove schedule... But I don't mind either way. I chose to remove the driver completely rather than marking it BROKEN because the removal of the driver cleans up platform code a lot :) Ok, if we hear anything back from Paulius in the next couple of weeks, I keep the driver there with BROKEN marked. Sounds fine to me. Of course, if someone wants the driver back and is willing to fix it, we'll just revert this patch even after the driver is gone. I would like an Ack from Mauro however. You did not Cc him directly in the patch, and he probably has an opionion on it as well, or may want to take this patch through his git tree. I've seen Guennadi is collecting camera patches and sending them to Mauro recently. So I think Guennadi is someone that Mauro trusts. But yes, we should copy him directly to see if he has an opionion on this driver removal. Shawn -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 12/34] media: mx1_camera: remove the driver
On Tuesday 18 September 2012, Shawn Guo wrote: On Mon, Sep 17, 2012 at 10:33:25AM +0200, Guennadi Liakhovetski wrote: Ok, it used to compile not-so-long-ago, but it doesn't seem to be cared for a lot lately. Let's give Paulius a bit more time to react to this mail, otherwise I'll have no objections. Just as an idea, to make it a bit milder we could first mark it BROKEN and add to remove schedule... But I don't mind either way. I chose to remove the driver completely rather than marking it BROKEN because the removal of the driver cleans up platform code a lot :) Ok, if we hear anything back from Paulius in the next couple of weeks, I keep the driver there with BROKEN marked. Sounds fine to me. Of course, if someone wants the driver back and is willing to fix it, we'll just revert this patch even after the driver is gone. I would like an Ack from Mauro however. You did not Cc him directly in the patch, and he probably has an opionion on it as well, or may want to take this patch through his git tree. Arnd -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 12/34] media: mx1_camera: remove the driver
On Mon, 17 Sep 2012, Shawn Guo wrote: The mx1_camera driver has been broken for a few release cycles since commit 6bd0812 (dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c). It seems there is no one even compile tested it since then, as doing so will end up with the following error. CC drivers/media/video/mx1_camera.o In file included from drivers/media/video/mx1_camera.c:44:0: arch/arm/mach-imx/include/mach/dma-mx1-mx2.h:8:25: fatal error: mach/dma-v1.h: No such file or directory It looks that all the related folks have known the breakage [1], but no one shows the interest to bring it back to work. Thus it becomes a piece of unmaintained code, so let's remove it. [1] https://lkml.org/lkml/2012/2/9/171 Signed-off-by: Shawn Guo shawn@linaro.org Cc: Paulius Zaleckas paulius.zalec...@teltonika.lt Cc: Guennadi Liakhovetski g.liakhovet...@gmx.de Cc: linux-media@vger.kernel.org Ok, it used to compile not-so-long-ago, but it doesn't seem to be cared for a lot lately. Let's give Paulius a bit more time to react to this mail, otherwise I'll have no objections. Just as an idea, to make it a bit milder we could first mark it BROKEN and add to remove schedule... But I don't mind either way. Thanks Guennadi --- arch/arm/mach-imx/Makefile |3 - arch/arm/mach-imx/clk-imx1.c|1 - arch/arm/mach-imx/devices/Kconfig |3 - arch/arm/mach-imx/devices/Makefile |1 - arch/arm/mach-imx/devices/devices-common.h | 10 - arch/arm/mach-imx/devices/platform-mx1-camera.c | 42 -- arch/arm/mach-imx/mx1-camera-fiq-ksym.c | 18 - arch/arm/mach-imx/mx1-camera-fiq.S | 35 - drivers/media/video/Kconfig | 12 - drivers/media/video/Makefile|1 - drivers/media/video/mx1_camera.c| 889 --- include/linux/platform_data/camera-mx1.h| 35 - 12 files changed, 1050 deletions(-) delete mode 100644 arch/arm/mach-imx/devices/platform-mx1-camera.c delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq-ksym.c delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq.S delete mode 100644 drivers/media/video/mx1_camera.c delete mode 100644 include/linux/platform_data/camera-mx1.h diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index fe47b71..538d0ee 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -35,9 +35,6 @@ obj-y += ssi-fiq.o obj-y += ssi-fiq-ksym.o endif -# Support for CMOS sensor interface -obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o - # i.MX1 based machines obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o diff --git a/arch/arm/mach-imx/clk-imx1.c b/arch/arm/mach-imx/clk-imx1.c index b5f90cc..ebfffd2 100644 --- a/arch/arm/mach-imx/clk-imx1.c +++ b/arch/arm/mach-imx/clk-imx1.c @@ -84,7 +84,6 @@ int __init mx1_clocks_init(unsigned long fref) i, PTR_ERR(clk[i])); clk_register_clkdev(clk[dma_gate], ahb, imx-dma); - clk_register_clkdev(clk[csi_gate], NULL, mx1-camera.0); clk_register_clkdev(clk[mma_gate], mma, NULL); clk_register_clkdev(clk[usbd_gate], NULL, imx_udc.0); clk_register_clkdev(clk[per1], per, imx-gpt.0); diff --git a/arch/arm/mach-imx/devices/Kconfig b/arch/arm/mach-imx/devices/Kconfig index cb3e3ee..09d796e 100644 --- a/arch/arm/mach-imx/devices/Kconfig +++ b/arch/arm/mach-imx/devices/Kconfig @@ -46,9 +46,6 @@ config IMX_HAVE_PLATFORM_IMX_UDC config IMX_HAVE_PLATFORM_IPU_CORE bool -config IMX_HAVE_PLATFORM_MX1_CAMERA - bool - config IMX_HAVE_PLATFORM_MX2_CAMERA bool diff --git a/arch/arm/mach-imx/devices/Makefile b/arch/arm/mach-imx/devices/Makefile index ff22ed1..3cfdc37 100644 --- a/arch/arm/mach-imx/devices/Makefile +++ b/arch/arm/mach-imx/devices/Makefile @@ -17,7 +17,6 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UDC) += platform-imx_udc.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IPU_CORE) += platform-ipu-core.o -obj-$(CONFIG_IMX_HAVE_PLATFORM_MX1_CAMERA) += platform-mx1-camera.o obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_CAMERA) += platform-mx2-camera.o obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_EHCI) += platform-mxc-ehci.o obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_MMC) += platform-mxc-mmc.o diff --git a/arch/arm/mach-imx/devices/devices-common.h b/arch/arm/mach-imx/devices/devices-common.h index 9e3e3d8..34419b2 100644 --- a/arch/arm/mach-imx/devices/devices-common.h +++ b/arch/arm/mach-imx/devices/devices-common.h @@ -199,16 +199,6 @@ struct platform_device *__init imx_add_mx3_sdc_fb( const struct imx_ipu_core_data *data, struct mx3fb_platform_data *pdata); -#include
Re: [PATCH 12/34] media: mx1_camera: remove the driver
On Mon, Sep 17, 2012 at 10:33:25AM +0200, Guennadi Liakhovetski wrote: Ok, it used to compile not-so-long-ago, but it doesn't seem to be cared for a lot lately. Let's give Paulius a bit more time to react to this mail, otherwise I'll have no objections. Just as an idea, to make it a bit milder we could first mark it BROKEN and add to remove schedule... But I don't mind either way. I chose to remove the driver completely rather than marking it BROKEN because the removal of the driver cleans up platform code a lot :) Ok, if we hear anything back from Paulius in the next couple of weeks, I keep the driver there with BROKEN marked. Regards, Shawn -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 12/34] media: mx1_camera: remove the driver
The mx1_camera driver has been broken for a few release cycles since commit 6bd0812 (dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c). It seems there is no one even compile tested it since then, as doing so will end up with the following error. CC drivers/media/video/mx1_camera.o In file included from drivers/media/video/mx1_camera.c:44:0: arch/arm/mach-imx/include/mach/dma-mx1-mx2.h:8:25: fatal error: mach/dma-v1.h: No such file or directory It looks that all the related folks have known the breakage [1], but no one shows the interest to bring it back to work. Thus it becomes a piece of unmaintained code, so let's remove it. [1] https://lkml.org/lkml/2012/2/9/171 Signed-off-by: Shawn Guo shawn@linaro.org Cc: Paulius Zaleckas paulius.zalec...@teltonika.lt Cc: Guennadi Liakhovetski g.liakhovet...@gmx.de Cc: linux-media@vger.kernel.org --- arch/arm/mach-imx/Makefile |3 - arch/arm/mach-imx/clk-imx1.c|1 - arch/arm/mach-imx/devices/Kconfig |3 - arch/arm/mach-imx/devices/Makefile |1 - arch/arm/mach-imx/devices/devices-common.h | 10 - arch/arm/mach-imx/devices/platform-mx1-camera.c | 42 -- arch/arm/mach-imx/mx1-camera-fiq-ksym.c | 18 - arch/arm/mach-imx/mx1-camera-fiq.S | 35 - drivers/media/video/Kconfig | 12 - drivers/media/video/Makefile|1 - drivers/media/video/mx1_camera.c| 889 --- include/linux/platform_data/camera-mx1.h| 35 - 12 files changed, 1050 deletions(-) delete mode 100644 arch/arm/mach-imx/devices/platform-mx1-camera.c delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq-ksym.c delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq.S delete mode 100644 drivers/media/video/mx1_camera.c delete mode 100644 include/linux/platform_data/camera-mx1.h diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index fe47b71..538d0ee 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -35,9 +35,6 @@ obj-y += ssi-fiq.o obj-y += ssi-fiq-ksym.o endif -# Support for CMOS sensor interface -obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o - # i.MX1 based machines obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o diff --git a/arch/arm/mach-imx/clk-imx1.c b/arch/arm/mach-imx/clk-imx1.c index b5f90cc..ebfffd2 100644 --- a/arch/arm/mach-imx/clk-imx1.c +++ b/arch/arm/mach-imx/clk-imx1.c @@ -84,7 +84,6 @@ int __init mx1_clocks_init(unsigned long fref) i, PTR_ERR(clk[i])); clk_register_clkdev(clk[dma_gate], ahb, imx-dma); - clk_register_clkdev(clk[csi_gate], NULL, mx1-camera.0); clk_register_clkdev(clk[mma_gate], mma, NULL); clk_register_clkdev(clk[usbd_gate], NULL, imx_udc.0); clk_register_clkdev(clk[per1], per, imx-gpt.0); diff --git a/arch/arm/mach-imx/devices/Kconfig b/arch/arm/mach-imx/devices/Kconfig index cb3e3ee..09d796e 100644 --- a/arch/arm/mach-imx/devices/Kconfig +++ b/arch/arm/mach-imx/devices/Kconfig @@ -46,9 +46,6 @@ config IMX_HAVE_PLATFORM_IMX_UDC config IMX_HAVE_PLATFORM_IPU_CORE bool -config IMX_HAVE_PLATFORM_MX1_CAMERA - bool - config IMX_HAVE_PLATFORM_MX2_CAMERA bool diff --git a/arch/arm/mach-imx/devices/Makefile b/arch/arm/mach-imx/devices/Makefile index ff22ed1..3cfdc37 100644 --- a/arch/arm/mach-imx/devices/Makefile +++ b/arch/arm/mach-imx/devices/Makefile @@ -17,7 +17,6 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UDC) += platform-imx_udc.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IPU_CORE) += platform-ipu-core.o -obj-$(CONFIG_IMX_HAVE_PLATFORM_MX1_CAMERA) += platform-mx1-camera.o obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_CAMERA) += platform-mx2-camera.o obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_EHCI) += platform-mxc-ehci.o obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_MMC) += platform-mxc-mmc.o diff --git a/arch/arm/mach-imx/devices/devices-common.h b/arch/arm/mach-imx/devices/devices-common.h index 9e3e3d8..34419b2 100644 --- a/arch/arm/mach-imx/devices/devices-common.h +++ b/arch/arm/mach-imx/devices/devices-common.h @@ -199,16 +199,6 @@ struct platform_device *__init imx_add_mx3_sdc_fb( const struct imx_ipu_core_data *data, struct mx3fb_platform_data *pdata); -#include linux/platform_data/camera-mx1.h -struct imx_mx1_camera_data { - resource_size_t iobase; - resource_size_t iosize; - resource_size_t irq; -}; -struct platform_device *__init imx_add_mx1_camera( - const struct imx_mx1_camera_data *data, - const struct mx1_camera_pdata *pdata); - #include linux/platform_data/camera-mx2.h struct imx_mx2_camera_data { resource_size_t iobasecsi; diff --git