From: Shen Zhenyi Date: Fri, 30 Oct 2015 05:59:55 +0000 (+0800) Subject: hdmi: cec: add HDMI_IOCTL_CECWAKESTATE X-Git-Tag: firefly_0821_release~3658 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=22cd9571827e9a2dbb4c93b271e04ef3751b2b5e;p=firefly-linux-kernel-4.4.55.git hdmi: cec: add HDMI_IOCTL_CECWAKESTATE android HDMI CEC HAL need to know cec state when resume, so we add the HDMI_IOCTL_CECWAKESTATE. Change-Id: Iff942c6085d10891200cd873cc2ba53e9a2d6cad Signed-off-by: Shen Zhenyi --- diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmi-cec.c b/drivers/video/rockchip/hdmi/rockchip-hdmi-cec.c index 68c7bf115152..f7e25f844245 100644 --- a/drivers/video/rockchip/hdmi/rockchip-hdmi-cec.c +++ b/drivers/video/rockchip/hdmi/rockchip-hdmi-cec.c @@ -226,6 +226,9 @@ static long cec_ioctl(struct file *file, unsigned int cmd, unsigned long arg) break; case HDMI_IOCTL_CECCLEARLA: break; + case HDMI_IOCTL_CECWAKESTATE: + ret = copy_to_user(argp, &(cec_dev->hdmi->sleep), sizeof(int)); + break; default: break; diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmi-cec.h b/drivers/video/rockchip/hdmi/rockchip-hdmi-cec.h index 86d94c45b193..cedb02d2d5f8 100644 --- a/drivers/video/rockchip/hdmi/rockchip-hdmi-cec.h +++ b/drivers/video/rockchip/hdmi/rockchip-hdmi-cec.h @@ -184,7 +184,9 @@ struct cec_device { #define HDMI_IOCTL_CECREAD _IOR(HDMI_CEC_MAGIC, 4, struct cec_framedata) #define HDMI_IOCTL_CECSETLA _IOW(HDMI_CEC_MAGIC, 5, int) #define HDMI_IOCTL_CECCLEARLA _IOW(HDMI_CEC_MAGIC, 6, int) +#define HDMI_IOCTL_CECWAKESTATE _IOR(HDMI_CEC_MAGIC, 7, int) /*for HAL ioctl end*/ + int rockchip_hdmi_cec_init(struct hdmi *hdmi, int (*sendframe)(struct hdmi *, struct cec_framedata *), @@ -193,4 +195,4 @@ int rockchip_hdmi_cec_init(struct hdmi *hdmi, void (*setceclogicaddr)(struct hdmi *, int)); void rockchip_hdmi_cec_set_pa(int devpa); void rockchip_hdmi_cec_submit_work(int event, int delay, void *data); -#endif /* __HDMI_CEC_H__ */ \ No newline at end of file +#endif /* __HDMI_CEC_H__ */