Commit 5bb2399a authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] cec: fix Kconfig dependency problems 



- Use IS_REACHABLE(RC_CORE) instead of IS_ENABLED: if cec is built-in and
  RC_CORE is a module, then CEC can't reach the RC symbols.
- Both cec and cec-edid should be bool and use the same build 'mode' as
  MEDIA_SUPPORT (just as is done for the media controller code).
- Add a note to staging that this should be changed once the cec framework
  is moved out of staging.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent ea8c535e

drivers/media/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ config MEDIA_RC_SUPPORT 
	  Say Y when you have a TV or an IR device.



config MEDIA_CEC_EDID

	tristate

	bool



#

# Media controller

drivers/media/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ 
# Makefile for the kernel multimedia device drivers.

#



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

ifeq ($(CONFIG_MEDIA_CEC_EDID),y)

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

endif



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

drivers/staging/media/cec/Kconfig

+1 −1
Original line number Diff line number Diff line 
config MEDIA_CEC

	tristate "CEC API (EXPERIMENTAL)"

	bool "CEC API (EXPERIMENTAL)"

	depends on MEDIA_SUPPORT

	select MEDIA_CEC_EDID

	---help---

drivers/staging/media/cec/Makefile

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



obj-$(CONFIG_MEDIA_CEC) += cec.o
 
ifeq ($(CONFIG_MEDIA_CEC),y)

  obj-$(CONFIG_MEDIA_SUPPORT) += cec.o

endif

drivers/staging/media/cec/TODO

+5 −0
Original line number Diff line number Diff line
@@ -23,5 +23,10 @@ Other TODOs: 
  And also TYPE_SWITCH and TYPE_CDC_ONLY in addition to the TYPE_UNREGISTERED?

  This should give the framework more information about the device type

  since SPECIFIC and UNREGISTERED give no useful information.

- Once this is out of staging this should no longer be a separate

  config option, instead it should be selected by drivers that want it.

- Revisit the IS_REACHABLE(RC_CORE): perhaps the RC_CORE support should

  be enabled through a separate config option in drivers/media/Kconfig

  or rc/Kconfig?



Hans Verkuil <hans.verkuil@cisco.com>

CRA Git | Maintained and supported by SUSTech CRA and CCSE