summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorDariusz Marcinkiewicz2019-06-20 11:17:18 +0200
committerMauro Carvalho Chehab2019-06-27 13:18:43 +0200
commit32a847f9fa40ec1b03ead2c514862764983ff9ca (patch)
treeb3d447e38e74522a0cad174a1f13220316b38506 /drivers/media/platform
parentmedia: cec-notifier: rename variables, check kstrdup and n->conn_name (diff)
downloadkernel-qcow2-linux-32a847f9fa40ec1b03ead2c514862764983ff9ca.tar.gz
kernel-qcow2-linux-32a847f9fa40ec1b03ead2c514862764983ff9ca.tar.xz
kernel-qcow2-linux-32a847f9fa40ec1b03ead2c514862764983ff9ca.zip
media: cec: add struct cec_connector_info support
Define struct cec_connector_info in media/cec.h and define CEC_CAP_CONNECTOR_INFO. In a later patch this will be moved to uapi/linux/cec.h. The CEC_CAP_CONNECTOR_INFO capability can be set by drivers, but cec_allocate_adapter() will remove it again until the public API for this can be enabled once all drm drivers wire this up correctly. Also add the cec_fill_conn_info_from_drm and cec_s_conn_info functions, which are needed by drm drivers to fill in the cec_connector info based on a drm_connector. The cec_notifier_(un)register and cec_register_cec_notifier prototypes were moved from cec-notifier.h to cec.h since cec.h no longer includes cec-notifier.h. These headers included each other before, which caused various problems. Due to these changes the seco-cec driver was changed as well: it should include cec-notifier.h, not cec.h. Signed-off-by: Dariusz Marcinkiewicz <darekm@google.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/seco-cec/seco-cec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/seco-cec/seco-cec.c b/drivers/media/platform/seco-cec/seco-cec.c
index e5080d6f5b2d..1d0133f01e00 100644
--- a/drivers/media/platform/seco-cec/seco-cec.c
+++ b/drivers/media/platform/seco-cec/seco-cec.c
@@ -18,7 +18,7 @@
#include <linux/platform_device.h>
/* CEC Framework */
-#include <media/cec.h>
+#include <media/cec-notifier.h>
#include "seco-cec.h"