On Mon, 20 Aug 2012, Mauro Carvalho Chehab wrote:
> Em 20-08-2012 16:32, Guennadi Liakhovetski escreveu:
> >> .../platform/{ => soc_camera}/omap24xxcam-dma.c | 0
> >> .../media/platform/{ => soc_camera}/omap24xxcam.c | 0
> >> .../media/platform/{ => soc_camera}/omap24xxcam.h | 0
> >
> > omap24xxcam are not soc-camera drivers.
>
> Sorry. Omap2 was in the middle of the SOC_CAMERA menu items.
>
> version 2 follows.
>
> -
>
> [PATCH v2] [media] move soc_camera to its own directory
>
> That helps to better organize the soc_camera items.
>
> While here, cleanup Makefiles, removing uneeded include dirs.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Thanks
Guennadi
> ---
>
> v2: kept omap2 at platform menu;
> added missing soc_camera/(Kconfig|Makefile) files.
>
> drivers/media/platform/Kconfig | 103 ++-------------------
> drivers/media/platform/Makefile | 31 +------
> drivers/media/platform/soc_camera/Kconfig | 87 +++++++++++++++++
> drivers/media/platform/soc_camera/Makefile | 14 +++
> .../media/platform/{ => soc_camera}/atmel-isi.c | 0
> .../media/platform/{ => soc_camera}/mx1_camera.c | 0
> .../media/platform/{ => soc_camera}/mx2_camera.c | 0
> .../media/platform/{ => soc_camera}/mx3_camera.c | 0
> .../media/platform/{ => soc_camera}/omap1_camera.c | 0
> .../media/platform/{ => soc_camera}/pxa_camera.c | 0
> .../{ => soc_camera}/sh_mobile_ceu_camera.c | 0
> .../platform/{ => soc_camera}/sh_mobile_csi2.c | 0
> .../media/platform/{ => soc_camera}/soc_camera.c | 0
> .../{ => soc_camera}/soc_camera_platform.c | 0
> .../media/platform/{ => soc_camera}/soc_mediabus.c | 0
> 15 files changed, 114 insertions(+), 121 deletions(-)
> create mode 100644 drivers/media/platform/soc_camera/Kconfig
> create mode 100644 drivers/media/platform/soc_camera/Makefile
> rename drivers/media/platform/{ => soc_camera}/atmel-isi.c (100%)
> rename drivers/media/platform/{ => soc_camera}/mx1_camera.c (100%)
> rename drivers/media/platform/{ => soc_camera}/mx2_camera.c (100%)
> rename drivers/media/platform/{ => soc_camera}/mx3_camera.c (100%)
> rename drivers/media/platform/{ => soc_camera}/omap1_camera.c (100%)
> rename drivers/media/platform/{ => soc_camera}/pxa_camera.c (100%)
> rename drivers/media/platform/{ => soc_camera}/sh_mobile_ceu_camera.c (100%)
> rename drivers/media/platform/{ => soc_camera}/sh_mobile_csi2.c (100%)
> rename drivers/media/platform/{ => soc_camera}/soc_camera.c (100%)
> rename drivers/media/platform/{ => soc_camera}/soc_camera_platform.c (100%)
> rename drivers/media/platform/{ => soc_camera}/soc_mediabus.c (100%)
>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index e1959a8..242468b 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -105,6 +105,13 @@ config VIDEO_M32R_AR_M64278
> To compile this driver as a module, choose M here: the
> module will be called arv.
>
> +config VIDEO_OMAP2
> + tristate "OMAP2 Camera Capture Interface driver"
> + depends on VIDEO_DEV && ARCH_OMAP2
> + select VIDEOBUF_DMA_SG
> + ---help---
> + This is a v4l2 driver for the TI OMAP2 camera capture interface
> +
> config VIDEO_OMAP3
> tristate "OMAP 3 Camera support (EXPERIMENTAL)"
> depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
> @@ -117,101 +124,7 @@ config VIDEO_OMAP3_DEBUG
> ---help---
> Enable debug messages on OMAP 3 camera controller driver.
>
> -config SOC_CAMERA
> - tristate "SoC camera support"
> - depends on VIDEO_V4L2 && HAS_DMA && I2C
> - select VIDEOBUF_GEN
> - 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.
> -
> -
> -config SOC_CAMERA_PLATFORM
> - tristate "platform camera support"
> - depends on SOC_CAMERA
> - help
> - This is a generic SoC camera platform driver, useful for testing
> -
> -config MX1_VIDEO
> - bool
> -
> -config VIDEO_MX1
> - tristate "i.MX1/i.MXL CMOS Sensor Interface driver"
> - depends on VIDEO_DEV && ARCH_MX1 && SOC_CAMERA
> - select FIQ
> - select VIDEOBUF_DMA_CONTIG
> - select MX1_VIDEO
> - ---help---
> - This is a v4l2 driver for the i.MX1/i.MXL CMOS Sensor Interface
> -
> -config MX3_VIDEO
> - bool
> -
> -config VIDEO_MX3
> - tristate "i.MX3x Camera Sensor Interface driver"
> - depends on VIDEO_DEV && MX3_IPU && SOC_CAMERA
> - select VIDEOBUF2_DMA_CONTIG
> - select MX3_VIDEO
> - ---help---
> - This is a v4l2 driver for the i.MX3x Camera Sensor Interface
> -
> -config VIDEO_PXA27x
> - tristate "PXA27x Quick Capture Interface driver"
> - depends on VIDEO_DEV && PXA27x && SOC_CAMERA
> - select VIDEOBUF_DMA_SG
> - ---help---
> - This is a v4l2 driver for the PXA27x Quick Capture Interface
> -
> -config VIDEO_SH_MOBILE_CSI2
> - tristate "SuperH Mobile MIPI CSI-2 Interface driver"
> - depends on VIDEO_DEV && SOC_CAMERA && HAVE_CLK
> - ---help---
> - This is a v4l2 driver for the SuperH MIPI CSI-2 Interface
> -
> -config VIDEO_SH_MOBILE_CEU
> - tristate "SuperH Mobile CEU Interface driver"
> - depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK
> - select VIDEOBUF2_DMA_CONTIG
> - ---help---
> - This is a v4l2 driver for the SuperH Mobile CEU Interface
> -
> -config VIDEO_OMAP1
> - tristate "OMAP1 Camera Interface driver"
> - depends on VIDEO_DEV && ARCH_OMAP1 && SOC_CAMERA
> - select VIDEOBUF_DMA_CONTIG
> - select VIDEOBUF_DMA_SG
> - ---help---
> - This is a v4l2 driver for the TI OMAP1 camera interface
> -
> -config VIDEO_OMAP2
> - tristate "OMAP2 Camera Capture Interface driver"
> - depends on VIDEO_DEV && ARCH_OMAP2
> - select VIDEOBUF_DMA_SG
> - ---help---
> - This is a v4l2 driver for the TI OMAP2 camera capture interface
> -
> -config VIDEO_MX2_HOSTSUPPORT
> - bool
> -
> -config VIDEO_MX2
> - tristate "i.MX27/i.MX25 Camera Sensor Interface driver"
> - depends on VIDEO_DEV && SOC_CAMERA && (MACH_MX27 || (ARCH_MX25 && BROKEN))
> - select VIDEOBUF2_DMA_CONTIG
> - select VIDEO_MX2_HOSTSUPPORT
> - ---help---
> - This is a v4l2 driver for the i.MX27 and the i.MX25 Camera Sensor
> - Interface
> -
> -config VIDEO_ATMEL_ISI
> - tristate "ATMEL Image Sensor Interface (ISI) support"
> - depends on VIDEO_DEV && SOC_CAMERA && ARCH_AT91
> - select VIDEOBUF2_DMA_CONTIG
> - ---help---
> - This module makes the ATMEL Image Sensor Interface available
> - as a v4l2 device.
> -
> +source "drivers/media/platform/soc_camera/Kconfig"
> source "drivers/media/platform/s5p-fimc/Kconfig"
> source "drivers/media/platform/s5p-tv/Kconfig"
>
> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
> index b3effdc..71e1b28 100644
> --- a/drivers/media/platform/Makefile
> +++ b/drivers/media/platform/Makefile
> @@ -5,41 +5,25 @@
> omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o
>
> obj-$(CONFIG_VIDEO_VINO) += indycam.o
> -
> obj-$(CONFIG_VIDEO_VINO) += vino.o
> -obj-$(CONFIG_VIDEO_TIMBERDALE) += timblogiw.o
> -
>
> +obj-$(CONFIG_VIDEO_TIMBERDALE) += timblogiw.o
> obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
>
> -
> +obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
> obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/
> obj-$(CONFIG_VIDEO_MMP_CAMERA) += marvell-ccic/
>
> -obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
> -
> +obj-$(CONFIG_VIDEO_OMAP2) += omap2cam.o
> obj-$(CONFIG_VIDEO_OMAP3) += omap3isp/
>
> obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
> obj-$(CONFIG_VIDEO_VIVI) += vivi.o
> -obj-$(CONFIG_VIDEO_MEM2MEM_TESTDEV) += mem2mem_testdev.o
> -
>
> -obj-$(CONFIG_VIDEO_OMAP2) += omap2cam.o
> -obj-$(CONFIG_SOC_CAMERA) += soc_camera.o soc_mediabus.o
> -obj-$(CONFIG_SOC_CAMERA_PLATFORM) += soc_camera_platform.o
> -# soc-camera host drivers have to be linked after camera drivers
> -obj-$(CONFIG_VIDEO_MX1) += mx1_camera.o
> -obj-$(CONFIG_VIDEO_MX2) += mx2_camera.o
> -obj-$(CONFIG_VIDEO_MX3) += mx3_camera.o
> -obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o
> -obj-$(CONFIG_VIDEO_SH_MOBILE_CSI2) += sh_mobile_csi2.o
> -obj-$(CONFIG_VIDEO_SH_MOBILE_CEU) += sh_mobile_ceu_camera.o
> -obj-$(CONFIG_VIDEO_OMAP1) += omap1_camera.o
> -obj-$(CONFIG_VIDEO_ATMEL_ISI) += atmel-isi.o
> +obj-$(CONFIG_VIDEO_MEM2MEM_TESTDEV) += mem2mem_testdev.o
>
> obj-$(CONFIG_VIDEO_MX2_EMMAPRP) += mx2_emmaprp.o
> -obj-$(CONFIG_VIDEO_CODA) += coda.o
> +obj-$(CONFIG_VIDEO_CODA) += coda.o
>
> obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o
>
> @@ -59,8 +43,3 @@ obj-$(CONFIG_VIDEO_SH_VOU) += sh_vou.o
> obj-y += davinci/
>
> obj-$(CONFIG_ARCH_OMAP) += omap/
> -
> -ccflags-y += -I$(srctree)/drivers/media/dvb-core
> -ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
> -ccflags-y += -I$(srctree)/drivers/media/tuners
> -ccflags-y += -I$(srctree)/drivers/media/i2c/soc_camera
> diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig
> new file mode 100644
> index 0000000..9afe1e7
> --- /dev/null
> +++ b/drivers/media/platform/soc_camera/Kconfig
> @@ -0,0 +1,87 @@
> +config SOC_CAMERA
> + tristate "SoC camera support"
> + depends on VIDEO_V4L2 && HAS_DMA && I2C
> + select VIDEOBUF_GEN
> + 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.
> +
> +config SOC_CAMERA_PLATFORM
> + tristate "platform camera support"
> + depends on SOC_CAMERA
> + help
> + This is a generic SoC camera platform driver, useful for testing
> +
> +config MX1_VIDEO
> + bool
> +
> +config VIDEO_MX1
> + tristate "i.MX1/i.MXL CMOS Sensor Interface driver"
> + depends on VIDEO_DEV && ARCH_MX1 && SOC_CAMERA
> + select FIQ
> + select VIDEOBUF_DMA_CONTIG
> + select MX1_VIDEO
> + ---help---
> + This is a v4l2 driver for the i.MX1/i.MXL CMOS Sensor Interface
> +
> +config MX3_VIDEO
> + bool
> +
> +config VIDEO_MX3
> + tristate "i.MX3x Camera Sensor Interface driver"
> + depends on VIDEO_DEV && MX3_IPU && SOC_CAMERA
> + select VIDEOBUF2_DMA_CONTIG
> + select MX3_VIDEO
> + ---help---
> + This is a v4l2 driver for the i.MX3x Camera Sensor Interface
> +
> +config VIDEO_PXA27x
> + tristate "PXA27x Quick Capture Interface driver"
> + depends on VIDEO_DEV && PXA27x && SOC_CAMERA
> + select VIDEOBUF_DMA_SG
> + ---help---
> + This is a v4l2 driver for the PXA27x Quick Capture Interface
> +
> +config VIDEO_SH_MOBILE_CSI2
> + tristate "SuperH Mobile MIPI CSI-2 Interface driver"
> + depends on VIDEO_DEV && SOC_CAMERA && HAVE_CLK
> + ---help---
> + This is a v4l2 driver for the SuperH MIPI CSI-2 Interface
> +
> +config VIDEO_SH_MOBILE_CEU
> + tristate "SuperH Mobile CEU Interface driver"
> + depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK
> + select VIDEOBUF2_DMA_CONTIG
> + ---help---
> + This is a v4l2 driver for the SuperH Mobile CEU Interface
> +
> +config VIDEO_OMAP1
> + tristate "OMAP1 Camera Interface driver"
> + depends on VIDEO_DEV && ARCH_OMAP1 && SOC_CAMERA
> + select VIDEOBUF_DMA_CONTIG
> + select VIDEOBUF_DMA_SG
> + ---help---
> + This is a v4l2 driver for the TI OMAP1 camera interface
> +
> +config VIDEO_MX2_HOSTSUPPORT
> + bool
> +
> +config VIDEO_MX2
> + tristate "i.MX27/i.MX25 Camera Sensor Interface driver"
> + depends on VIDEO_DEV && SOC_CAMERA && (MACH_MX27 || (ARCH_MX25 && BROKEN))
> + select VIDEOBUF2_DMA_CONTIG
> + select VIDEO_MX2_HOSTSUPPORT
> + ---help---
> + This is a v4l2 driver for the i.MX27 and the i.MX25 Camera Sensor
> + Interface
> +
> +config VIDEO_ATMEL_ISI
> + tristate "ATMEL Image Sensor Interface (ISI) support"
> + depends on VIDEO_DEV && SOC_CAMERA && ARCH_AT91
> + select VIDEOBUF2_DMA_CONTIG
> + ---help---
> + This module makes the ATMEL Image Sensor Interface available
> + as a v4l2 device.
> +
> diff --git a/drivers/media/platform/soc_camera/Makefile b/drivers/media/platform/soc_camera/Makefile
> new file mode 100644
> index 0000000..136b7f8
> --- /dev/null
> +++ b/drivers/media/platform/soc_camera/Makefile
> @@ -0,0 +1,14 @@
> +obj-$(CONFIG_SOC_CAMERA) += soc_camera.o soc_mediabus.o
> +obj-$(CONFIG_SOC_CAMERA_PLATFORM) += soc_camera_platform.o
> +
> +# soc-camera host drivers have to be linked after camera drivers
> +obj-$(CONFIG_VIDEO_ATMEL_ISI) += atmel-isi.o
> +obj-$(CONFIG_VIDEO_MX1) += mx1_camera.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
> +
> +ccflags-y += -I$(srctree)/drivers/media/i2c/soc_camera
> diff --git a/drivers/media/platform/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
> similarity index 100%
> rename from drivers/media/platform/atmel-isi.c
> rename to drivers/media/platform/soc_camera/atmel-isi.c
> diff --git a/drivers/media/platform/mx1_camera.c b/drivers/media/platform/soc_camera/mx1_camera.c
> similarity index 100%
> rename from drivers/media/platform/mx1_camera.c
> rename to drivers/media/platform/soc_camera/mx1_camera.c
> diff --git a/drivers/media/platform/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
> similarity index 100%
> rename from drivers/media/platform/mx2_camera.c
> rename to drivers/media/platform/soc_camera/mx2_camera.c
> diff --git a/drivers/media/platform/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
> similarity index 100%
> rename from drivers/media/platform/mx3_camera.c
> rename to drivers/media/platform/soc_camera/mx3_camera.c
> diff --git a/drivers/media/platform/omap1_camera.c b/drivers/media/platform/soc_camera/omap1_camera.c
> similarity index 100%
> rename from drivers/media/platform/omap1_camera.c
> rename to drivers/media/platform/soc_camera/omap1_camera.c
> diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
> similarity index 100%
> rename from drivers/media/platform/pxa_camera.c
> rename to drivers/media/platform/soc_camera/pxa_camera.c
> diff --git a/drivers/media/platform/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
> similarity index 100%
> rename from drivers/media/platform/sh_mobile_ceu_camera.c
> rename to drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
> diff --git a/drivers/media/platform/sh_mobile_csi2.c b/drivers/media/platform/soc_camera/sh_mobile_csi2.c
> similarity index 100%
> rename from drivers/media/platform/sh_mobile_csi2.c
> rename to drivers/media/platform/soc_camera/sh_mobile_csi2.c
> diff --git a/drivers/media/platform/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
> similarity index 100%
> rename from drivers/media/platform/soc_camera.c
> rename to drivers/media/platform/soc_camera/soc_camera.c
> diff --git a/drivers/media/platform/soc_camera_platform.c b/drivers/media/platform/soc_camera/soc_camera_platform.c
> similarity index 100%
> rename from drivers/media/platform/soc_camera_platform.c
> rename to drivers/media/platform/soc_camera/soc_camera_platform.c
> diff --git a/drivers/media/platform/soc_mediabus.c b/drivers/media/platform/soc_camera/soc_mediabus.c
> similarity index 100%
> rename from drivers/media/platform/soc_mediabus.c
> rename to drivers/media/platform/soc_camera/soc_mediabus.c
> --
> 1.7.11.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
