Commit 78fc853b authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] move s5p-cec to staging 



As the CEC core is currently at staging, it doesn't make any sense
to put a dependent driver outside staging. So, move it also to
staging.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 6f8adea2

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1647,7 +1647,7 @@ M: Kyungmin Park <kyungmin.park@samsung.com> 
L:	linux-arm-kernel@lists.infradead.org

L:	linux-media@vger.kernel.org

S:	Maintained

F:	drivers/media/platform/s5p-cec/

F:	drivers/staging/media/platform/s5p-cec/



ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT

M:	Andrzej Pietrasiewicz <andrzej.p@samsung.com>

drivers/media/platform/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -108,16 +108,6 @@ config VIDEO_S3C_CAMIF 
source "drivers/media/platform/soc_camera/Kconfig"

source "drivers/media/platform/exynos4-is/Kconfig"

source "drivers/media/platform/s5p-tv/Kconfig"



config VIDEO_SAMSUNG_S5P_CEC

	tristate "Samsung S5P CEC driver"

	depends on VIDEO_DEV && MEDIA_CEC && (PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST)

	---help---

	  This is a driver for Samsung S5P HDMI CEC interface. It uses the

	  generic CEC framework interface.

	  CEC bus is present in the HDMI connector and enables communication

	  between compatible devices.



source "drivers/media/platform/am437x/Kconfig"

source "drivers/media/platform/xilinx/Kconfig"

source "drivers/media/platform/rcar-vin/Kconfig"

drivers/media/platform/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o 


obj-$(CONFIG_VIDEO_S3C_CAMIF) 		+= s3c-camif/

obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS) 	+= exynos4-is/

obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC)	+= s5p-cec/

obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG)	+= s5p-jpeg/

obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC)	+= s5p-mfc/

obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV)	+= s5p-tv/

drivers/staging/media/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ source "drivers/staging/media/omap4iss/Kconfig" 


source "drivers/staging/media/tw686x-kh/Kconfig"



source "drivers/staging/media/s5p-cec/Kconfig"



# Keep LIRC at the end, as it has sub-menus

source "drivers/staging/media/lirc/Kconfig"

drivers/staging/media/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_I2C_BCM2048)	+= bcm2048/

obj-$(CONFIG_MEDIA_CEC)		+= cec/

obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p-cec/

obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/

obj-$(CONFIG_LIRC_STAGING)	+= lirc/

obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/