Commit 0dbacebe authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
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.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent a69a168a

Documentation/media/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ $(BUILDDIR)/videodev2.h.rst: ${UAPI}/videodev2.h ${PARSER} $(SRC_DIR)/videodev2. 
$(BUILDDIR)/media.h.rst: ${UAPI}/media.h ${PARSER} $(SRC_DIR)/media.h.rst.exceptions

$(BUILDDIR)/media.h.rst: ${UAPI}/media.h ${PARSER} $(SRC_DIR)/media.h.rst.exceptions

	@$($(quiet)gen_rst)

	@$($(quiet)gen_rst)





$(BUILDDIR)/cec.h.rst: ${KAPI}/cec.h ${PARSER} $(SRC_DIR)/cec.h.rst.exceptions

$(BUILDDIR)/cec.h.rst: ${UAPI}/cec.h ${PARSER} $(SRC_DIR)/cec.h.rst.exceptions

	@$($(quiet)gen_rst)

	@$($(quiet)gen_rst)





$(BUILDDIR)/lirc.h.rst: ${UAPI}/lirc.h ${PARSER} $(SRC_DIR)/lirc.h.rst.exceptions

$(BUILDDIR)/lirc.h.rst: ${UAPI}/lirc.h ${PARSER} $(SRC_DIR)/lirc.h.rst.exceptions

drivers/media/Kconfig

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




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

	  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

config MEDIA_CEC_EDID

	bool

	bool

drivers/media/Makefile

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

  obj-$(CONFIG_MEDIA_SUPPORT) += cec-edid.o

endif

endif





ifeq ($(CONFIG_MEDIA_CEC_SUPPORT),y)

  obj-$(CONFIG_MEDIA_SUPPORT) += cec/

endif



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

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 Original line Diff line number Diff line 
cec-objs := cec-core.o cec-adap.o cec-api.o

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

  obj-$(CONFIG_MEDIA_SUPPORT) += cec.o

endif
 
endif