From 751f9ac72e893c5993e6ce180812e961a76224f2 Mon Sep 17 00:00:00 2001 From: Shiju Mathew Date: Thu, 31 Mar 2016 17:27:34 -0400 Subject: msm: ba: Merge relevant changes from A family Merge relevant bridge abstraction changes from 8064 to MSM8996. CRs-Fixed: 998927 Change-Id: I4baaa5a8b93cade64b0064acdc63b3b4ab7765e7 Signed-off-by: Shiju Mathew --- include/uapi/linux/videodev2.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'include/uapi/linux') diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 9823ff7e8f4d..bb2c4ebf9ff4 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -2207,8 +2207,10 @@ struct v4l2_streamparm { (V4L2_EVENT_MSM_BA_START + 8) #define V4L2_EVENT_MSM_BA_CP \ (V4L2_EVENT_MSM_BA_START + 9) -#define V4L2_EVENT_MSM_BA_ERROR \ +#define V4L2_EVENT_MSM_BA_CABLE_DETECT \ (V4L2_EVENT_MSM_BA_START + 10) +#define V4L2_EVENT_MSM_BA_ERROR \ + (V4L2_EVENT_MSM_BA_START + 11) /* Payload for V4L2_EVENT_VSYNC */ struct v4l2_event_vsync { @@ -2465,4 +2467,11 @@ struct v4l2_create_buffers { #define BASE_VIDIOC_PRIVATE 192 /* 192-255 are private */ +/* HDMI rx provide ioctls */ +#define VIDIOC_HDMI_RX_CEC_S_LOGICAL _IOW('V', BASE_VIDIOC_PRIVATE + 0, int) +#define VIDIOC_HDMI_RX_CEC_CLEAR_LOGICAL _IO('V', BASE_VIDIOC_PRIVATE + 1) +#define VIDIOC_HDMI_RX_CEC_G_PHYSICAL _IOR('V', BASE_VIDIOC_PRIVATE + 2, int) +#define VIDIOC_HDMI_RX_CEC_G_CONNECTED _IOR('V', BASE_VIDIOC_PRIVATE + 3, int) +#define VIDIOC_HDMI_RX_CEC_S_ENABLE _IOR('V', BASE_VIDIOC_PRIVATE + 4, int) + #endif /* _UAPI__LINUX_VIDEODEV2_H */ -- cgit v1.2.3