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

Commit 97645478 authored by Hans Verkuil's avatar Hans Verkuil Committed by Ray Zhang
Browse files

[media] cec: move the CEC framework out of staging and to media 



The last open issues have been addressed, so it is time to move
this out of staging and into the mainline and to move the public
cec headers to include/uapi/linux.

Conflicts:
	Documentation/media/Makefile
	drivers/media/i2c/Kconfig
	drivers/media/platform/vivid/Kconfig
	drivers/staging/media/Makefile
	drivers/staging/media/pulse8-cec/Kconfig
	drivers/staging/media/s5p-cec/Kconfig
	drivers/staging/media/st-cec/Kconfig

Change-Id: Ie46e780a7d29d773dbb9bd642059695eb580e8ad
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Git-commit: 0dbacebede1e4e44bf500f94d692fad05eb2c293
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git


[rayz@codeaurora.org: make some modifications to the original patch to fix
 the cherry-pick conflicts. (1) discard the changes in Documentation. (2)
 discard the CEC adapter driver changes for other vendors because they are
 not needed.]
Signed-off-by: default avatarRay Zhang <rayz@codeaurora.org>
parent f2a6b606

drivers/media/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -80,6 +80,22 @@ config MEDIA_RC_SUPPORT 


	  Say Y when you have a TV or an IR device.



config MEDIA_CEC_SUPPORT

	bool "HDMI CEC support"

	select MEDIA_CEC_EDID

	---help---

	  Enable support for HDMI CEC (Consumer Electronics Control),

	  which is an optional HDMI feature.



	  Say Y when you have an HDMI receiver, transmitter or a USB CEC

	  adapter that supports HDMI CEC.



config MEDIA_CEC_DEBUG

	bool "HDMI CEC debugfs interface"

	depends on MEDIA_CEC_SUPPORT && DEBUG_FS

	---help---

	  Turns on the DebugFS interface for CEC devices.



config MEDIA_CEC_EDID

	bool

drivers/media/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ ifeq ($(CONFIG_MEDIA_CEC_EDID),y) 
  obj-$(CONFIG_MEDIA_SUPPORT) += cec-edid.o

endif



ifeq ($(CONFIG_MEDIA_CEC_SUPPORT),y)

  obj-$(CONFIG_MEDIA_SUPPORT) += cec/

endif



media-objs	:= media-device.o media-devnode.o media-entity.o



#

drivers/staging/media/cec/Makefile→drivers/media/cec/Makefile

+1 −1
Original line number Diff line number Diff line 
cec-objs := cec-core.o cec-adap.o cec-api.o



ifeq ($(CONFIG_MEDIA_CEC),y)

ifeq ($(CONFIG_MEDIA_CEC_SUPPORT),y)

  obj-$(CONFIG_MEDIA_SUPPORT) += cec.o

endif