mend rk1000 display ,remove some code in lcdc

diff --git a/arch/arm64/boot/dts/rk3368-box.dts b/arch/arm64/boot/dts/rk3368-box.dts
index 66cd4872479b14863d7b0aec16172fe200d1b146..a535417caedbd55b7a17ddfd9b7955174d016123 100755 (executable)
--- a/arch/arm64/boot/dts/rk3368-box.dts
+++ b/arch/arm64/boot/dts/rk3368-box.dts
@@ -593,7 +593,7 @@
 
 &fb {
        rockchip,disp-mode = <NO_DUAL>;
-       rockchip,uboot-logo-on = <1>;
+       rockchip,uboot-logo-on = <0>;
        rockchip,disp-policy = <DISPLAY_POLICY_BOX_TEMP>;
 };
 

diff --git a/drivers/video/rockchip/lcdc/rk3368_lcdc.c b/drivers/video/rockchip/lcdc/rk3368_lcdc.c
index 9864529f38c76612d08aca65b15c205ba588cd8d..3cf0e0bab22c17b82d411bd5a771780ea6071b40 100755 (executable)
--- a/drivers/video/rockchip/lcdc/rk3368_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3368_lcdc.c
@@ -2103,10 +2103,8 @@ static int rk3368_load_screen(struct rk_lcdc_driver *dev_drv, bool initscreen)
            dev_drv->trsm_ops &&
            dev_drv->trsm_ops->enable)
                dev_drv->trsm_ops->enable();    
-       if(initscreen ){
                if (screen->init)
                        screen->init();
-       }
        if (!lcdc_dev->standby)
                lcdc_msk_reg(lcdc_dev, SYS_CTRL, m_STANDBY_EN, v_STANDBY_EN(0));
        return 0;

diff --git a/drivers/video/rockchip/tve/rk1000/rk1000_tve.c b/drivers/video/rockchip/tve/rk1000/rk1000_tve.c
index 6b178b6e16c26dfecd3c06806dbd6a36af8ebaa4..169c83dd4348a72a4062d5f97b9ba29799bbfde0 100755 (executable)
--- a/drivers/video/rockchip/tve/rk1000/rk1000_tve.c
+++ b/drivers/video/rockchip/tve/rk1000/rk1000_tve.c
@@ -310,7 +310,6 @@ static int rk1000_tve_probe(struct i2c_client *client,
        pr_err("video src is lcdc%d, prop is %d\n", rk1000_tve.video_source,
               rk1000_tve.property);
 #endif
-       printk("-------|%d|-------\n",cvbsformat);
        if (cvbsformat >= 0)            
                rk1000_tve.mode = cvbsformat + 1;       
        else            

diff --git a/drivers/video/rockchip/tve/rk1000/rk1000_tve_cvbs.c b/drivers/video/rockchip/tve/rk1000/rk1000_tve_cvbs.c
index e0680481393a8da8844c01a24b74a55bd5eb1407..f73450f70efa713da3a29e4fb025117d5b1b27c5 100755 (executable)
--- a/drivers/video/rockchip/tve/rk1000/rk1000_tve_cvbs.c
+++ b/drivers/video/rockchip/tve/rk1000/rk1000_tve_cvbs.c
@@ -19,7 +19,11 @@ int rk1000_tv_ntsc_init(void)
        unsigned char tv_encoder_control_regs[] = {0x43, 0x01};
        int i;
        int ret;
-       printk("---------%s----%d-----\n",__FUNCTION__,__LINE__);
+
+       if(cvbsformat>=0){
+               return;
+       }
+       
        for (i = 0; i < sizeof(tv_encoder_regs); i++) {
                ret = rk1000_tv_write_block(i, tv_encoder_regs + i, 1);
                if (ret < 0) {
@@ -47,7 +51,11 @@ int rk1000_tv_pal_init(void)
        unsigned char tv_encoder_control_regs[] = {0x41, 0x01};
        int i;
        int ret;
-               
+
+       if(cvbsformat>=0){
+               return;
+       }
+       
        for (i = 0; i < sizeof(tv_encoder_regs); i++) {
                ret = rk1000_tv_write_block(i, tv_encoder_regs+i, 1);
                if (ret < 0) {