HDMI: modify de pol to fix no output and modify cat66121 hdmi init code

diff --git a/drivers/video/rockchip/hdmi/chips/cat66121/cat66121_hdmi.c b/drivers/video/rockchip/hdmi/chips/cat66121/cat66121_hdmi.c
index 68e0207b22a50fdf074fd30d3d05e022adcfbf2c..a0792156a7f35c4f367fde813a30366ccc2795c4 100755 (executable)
--- a/drivers/video/rockchip/hdmi/chips/cat66121/cat66121_hdmi.c
+++ b/drivers/video/rockchip/hdmi/chips/cat66121/cat66121_hdmi.c
@@ -167,8 +167,10 @@ static const struct file_operations hdmi_reg_fops = {
 static int rk_hdmi_drv_init(struct hdmi *hdmi_drv)
 {
        int ret = 0;
+       struct rk_screen screen;
 
-       if(HDMI_SOURCE_DEFAULT == HDMI_SOURCE_LCDC0)
+       rk_fb_get_prmry_screen(&screen);
+       if(screen.lcdc_id == 1)
                hdmi_drv->lcdc = rk_get_lcdc_drv("lcdc0");
        else
                hdmi_drv->lcdc = rk_get_lcdc_drv("lcdc1");

diff --git a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c
index e6bcb01e4e6fe05cb0a2f908181cb2e24b8d0271..88d0a86abfebdf9ee2de3aef1f11326239c0626f 100644 (file)
--- a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c
+++ b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c
@@ -462,7 +462,7 @@ static int rk3288_hdmi_config_phy(struct hdmi *hdmi_drv)
        hdmi_writel(hdmi_dev, MC_PHYRSTZ, v_PHY_RSTZ(0));
 
        //Set slave address as PHY GEN2 address
-       hdmi_writel(hdmi_dev, PHY_I2CM_SLAVE, PHY_I2C_SLAVE_ADDR);
+       hdmi_writel(hdmi_dev, PHY_I2CM_SLAVE, PHY_I2C_SLAVE_ADDR);      //TODO Daisen wait to modify
 
        rk3288_hdmi_write_phy(hdmi_dev, 0x13, 0x0000); /* PLLPHBYCTRL */
        rk3288_hdmi_write_phy(hdmi_dev, 0x17, 0x0006);

diff --git a/drivers/video/rockchip/hdmi/rk_hdmi_lcdc.c b/drivers/video/rockchip/hdmi/rk_hdmi_lcdc.c
index 7a1a97d65ec7c24fc00349068e791203607c1893..adc640596a9a31a471424a3f8a0e8efc87b31bd5 100755 (executable)
--- a/drivers/video/rockchip/hdmi/rk_hdmi_lcdc.c
+++ b/drivers/video/rockchip/hdmi/rk_hdmi_lcdc.c
@@ -127,7 +127,7 @@ int hdmi_set_info(struct rk_screen *screen, unsigned int vic)
        else
                screen->pin_vsync = 0;
 #endif
-       screen->pin_den = 1;    //TODO modify by Daisen
+       screen->pin_den = 0;
        screen->pin_dclk = DCLK_POL;
 
        /* Swap rule */

diff --git a/drivers/video/rockchip/hdmi/rk_hdmi_parse_dt.c b/drivers/video/rockchip/hdmi/rk_hdmi_parse_dt.c
index 7e2b3919061219cdc50bf16728e8f9b361d05ba7..20104e0a9400b636d877c5aa7fc33ea87d85131b 100644 (file)
--- a/drivers/video/rockchip/hdmi/rk_hdmi_parse_dt.c
+++ b/drivers/video/rockchip/hdmi/rk_hdmi_parse_dt.c
@@ -11,7 +11,7 @@
 int rk_hdmi_pwr_ctr_parse_dt(struct hdmi *dev_drv)
 {
        struct device_node *root  = of_find_node_by_name(dev_drv->dev->of_node,
-                               "power_ctr");
+                               "power_ctr_hdmi");
        struct device_node *child;
        struct rk_disp_pwr_ctr_list *pwr_ctr;
        struct list_head *pos;