mirror of
https://github.com/torvalds/linux.git
synced 2024-11-12 07:01:57 +00:00
[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: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
parent
6f8adea2b6
commit
78fc853b55
@ -1647,7 +1647,7 @@ M: Kyungmin Park <kyungmin.park@samsung.com>
|
|||||||
L: linux-arm-kernel@lists.infradead.org
|
L: linux-arm-kernel@lists.infradead.org
|
||||||
L: linux-media@vger.kernel.org
|
L: linux-media@vger.kernel.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: drivers/media/platform/s5p-cec/
|
F: drivers/staging/media/platform/s5p-cec/
|
||||||
|
|
||||||
ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
|
ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
|
||||||
M: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
|
M: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
|
||||||
|
@ -108,16 +108,6 @@ config VIDEO_S3C_CAMIF
|
|||||||
source "drivers/media/platform/soc_camera/Kconfig"
|
source "drivers/media/platform/soc_camera/Kconfig"
|
||||||
source "drivers/media/platform/exynos4-is/Kconfig"
|
source "drivers/media/platform/exynos4-is/Kconfig"
|
||||||
source "drivers/media/platform/s5p-tv/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/am437x/Kconfig"
|
||||||
source "drivers/media/platform/xilinx/Kconfig"
|
source "drivers/media/platform/xilinx/Kconfig"
|
||||||
source "drivers/media/platform/rcar-vin/Kconfig"
|
source "drivers/media/platform/rcar-vin/Kconfig"
|
||||||
|
@ -28,7 +28,6 @@ obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o
|
|||||||
|
|
||||||
obj-$(CONFIG_VIDEO_S3C_CAMIF) += s3c-camif/
|
obj-$(CONFIG_VIDEO_S3C_CAMIF) += s3c-camif/
|
||||||
obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS) += exynos4-is/
|
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_JPEG) += s5p-jpeg/
|
||||||
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc/
|
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc/
|
||||||
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV) += s5p-tv/
|
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV) += s5p-tv/
|
||||||
|
@ -31,6 +31,8 @@ source "drivers/staging/media/omap4iss/Kconfig"
|
|||||||
|
|
||||||
source "drivers/staging/media/tw686x-kh/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
|
# Keep LIRC at the end, as it has sub-menus
|
||||||
source "drivers/staging/media/lirc/Kconfig"
|
source "drivers/staging/media/lirc/Kconfig"
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
obj-$(CONFIG_I2C_BCM2048) += bcm2048/
|
obj-$(CONFIG_I2C_BCM2048) += bcm2048/
|
||||||
obj-$(CONFIG_MEDIA_CEC) += cec/
|
obj-$(CONFIG_MEDIA_CEC) += cec/
|
||||||
|
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p-cec/
|
||||||
obj-$(CONFIG_DVB_CXD2099) += cxd2099/
|
obj-$(CONFIG_DVB_CXD2099) += cxd2099/
|
||||||
obj-$(CONFIG_LIRC_STAGING) += lirc/
|
obj-$(CONFIG_LIRC_STAGING) += lirc/
|
||||||
obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
|
obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
|
||||||
|
9
drivers/staging/media/s5p-cec/Kconfig
Normal file
9
drivers/staging/media/s5p-cec/Kconfig
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
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.
|
||||||
|
|
3
drivers/staging/media/s5p-cec/TODO
Normal file
3
drivers/staging/media/s5p-cec/TODO
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
There's nothing wrong on this driver, except that it depends on
|
||||||
|
the media staging core, that it is currently at staging. So,
|
||||||
|
this should be kept here while the core is not promoted.
|
Loading…
Reference in New Issue
Block a user