Merge branch develop-3.10 into develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / hdmi / rk_hdmi.h

diff --git a/drivers/video/rockchip/hdmi/rk_hdmi.h b/drivers/video/rockchip/hdmi/rk_hdmi.h
index b8c15be418929a387f78e98cebca7e5c213e3df6..c853654871a5c3693482baa353e258a7a49d95b2 100755 (executable)
--- a/drivers/video/rockchip/hdmi/rk_hdmi.h
+++ b/drivers/video/rockchip/hdmi/rk_hdmi.h
@@ -331,6 +331,7 @@ struct hdmi {
        struct switch_dev switch_hdmi;
 #endif
 
+       struct mutex lock;
        struct workqueue_struct *workqueue;
        struct delayed_work delay_work;
 
@@ -362,6 +363,7 @@ struct hdmi {
        int yscale;             /* y directoon scale value */
        int tmdsclk;            /* TDMS Clock frequency */
        int pixclock;           /* Pixel Clcok frequency */
+       int uboot_logo;
 
        struct list_head pwrlist_head;
 
@@ -388,6 +390,8 @@ struct hdmi {
        void (*cec_set_device_pa)(int);
        int (*cec_enumerate)(void);
        struct rk_hdmi_drv_ops *ops;
+       unsigned int *support_vic;
+       int support_vic_num;
 };
 
 #define hdmi_err(dev, format, arg...)          \