Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bb738f2 authored Sep 06, 2016 by Robert Jarzmik Committed by Mauro Carvalho Chehab Sep 09, 2016

[media] media: platform: pxa_camera: move pxa_camera out of soc_camera



As the conversion to a v4l2 standalone device is finished, move
pxa_camera one directory up and finish severing any dependency to
soc_camera.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

parent fcdf9bbc

drivers/media/platform/Kconfig

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -91,6 +91,14 @@ config VIDEO_OMAP3_DEBUG
	---help---		---help---
	Enable debug messages on OMAP 3 camera controller driver.		Enable debug messages on OMAP 3 camera controller driver.

			config VIDEO_PXA27x
			tristate "PXA27x Quick Capture Interface driver"
			depends on VIDEO_DEV && PXA27x && HAS_DMA
			select VIDEOBUF2_DMA_SG
			select SG_SPLIT
			---help---
			This is a v4l2 driver for the PXA27x Quick Capture Interface

	config VIDEO_S3C_CAMIF		config VIDEO_S3C_CAMIF
	tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver"		tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver"
	depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API		depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API

drivers/media/platform/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9,6 +9,7 @@ obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/
	obj-$(CONFIG_VIDEO_MMP_CAMERA) += marvell-ccic/		obj-$(CONFIG_VIDEO_MMP_CAMERA) += marvell-ccic/

	obj-$(CONFIG_VIDEO_OMAP3) += omap3isp/		obj-$(CONFIG_VIDEO_OMAP3) += omap3isp/
			obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o soc_camera/soc_mediabus.o

	obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o		obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o

drivers/media/platform/soc_camera/pxa_camera.c→drivers/media/platform/pxa_camera.c

+0 −0

File moved.

drivers/media/platform/soc_camera/Kconfig

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -17,14 +17,6 @@ config SOC_CAMERA_PLATFORM
	help		help
	This is a generic SoC camera platform driver, useful for testing		This is a generic SoC camera platform driver, useful for testing

	config VIDEO_PXA27x
	tristate "PXA27x Quick Capture Interface driver"
	depends on VIDEO_DEV && PXA27x && HAS_DMA
	select VIDEOBUF2_DMA_SG
	select SG_SPLIT
	---help---
	This is a v4l2 driver for the PXA27x Quick Capture Interface

	config VIDEO_RCAR_VIN_OLD		config VIDEO_RCAR_VIN_OLD
	tristate "R-Car Video Input (VIN) support (DEPRECATED)"		tristate "R-Car Video Input (VIN) support (DEPRECATED)"
	depends on VIDEO_DEV && SOC_CAMERA		depends on VIDEO_DEV && SOC_CAMERA

drivers/media/platform/soc_camera/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7,6 +7,5 @@ obj-$(CONFIG_SOC_CAMERA_PLATFORM) += soc_camera_platform.o

	# soc-camera host drivers have to be linked after camera drivers		# soc-camera host drivers have to be linked after camera drivers
	obj-$(CONFIG_VIDEO_ATMEL_ISI) += atmel-isi.o		obj-$(CONFIG_VIDEO_ATMEL_ISI) += atmel-isi.o
	obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o
	obj-$(CONFIG_VIDEO_SH_MOBILE_CEU) += sh_mobile_ceu_camera.o		obj-$(CONFIG_VIDEO_SH_MOBILE_CEU) += sh_mobile_ceu_camera.o
	obj-$(CONFIG_VIDEO_RCAR_VIN_OLD) += rcar_vin.o		obj-$(CONFIG_VIDEO_RCAR_VIN_OLD) += rcar_vin.o