MIPI:1. reduce charge pump current 2.rmove interrupt 3. remove info print

diff --git a/arch/arm/boot/dts/lcd-wqxga-mipi.dtsi b/arch/arm/boot/dts/lcd-wqxga-mipi.dtsi
index de22c304a6550b64ff406710a627424b4b7d67ab..db842d217bd32bdf764bb4fe35b7a9156b38e301 100755 (executable)
--- a/arch/arm/boot/dts/lcd-wqxga-mipi.dtsi
+++ b/arch/arm/boot/dts/lcd-wqxga-mipi.dtsi
@@ -117,7 +117,7 @@
                                                        rockchip,cmd_type = <LPDT>;
                                                        rockchip,dsi_id = <2>;
                                                        rockchip,cmd = <0x05 dcs_exit_sleep_mode>;
-                                                       rockchip,cmd_delay = <100>;
+                                                       rockchip,cmd_delay = <120>;
                                        };
 
                                        rockchip,on-cmds13 {

diff --git a/drivers/video/rockchip/screen/lcd_mipi.c b/drivers/video/rockchip/screen/lcd_mipi.c
index 230fbefc3cad92bcad41a35e0a9b5ab45490bd6d..f304ace89d54cd9122d4196efd69ce3898030b26 100755 (executable)
--- a/drivers/video/rockchip/screen/lcd_mipi.c
+++ b/drivers/video/rockchip/screen/lcd_mipi.c
@@ -38,7 +38,7 @@
 #ifdef CONFIG_RK_3288_DSI_UBOOT
 #define        MIPI_SCREEN_DBG(x...)   //printf(x)
 #elif defined CONFIG_LCD_MIPI
-#define        MIPI_SCREEN_DBG(x...)   printk(KERN_ERR x)
+#define        MIPI_SCREEN_DBG(x...)   //printk(KERN_ERR x)
 #else
 #define        MIPI_SCREEN_DBG(x...)  
 #endif

diff --git a/drivers/video/rockchip/transmitter/rk32_mipi_dsi.c b/drivers/video/rockchip/transmitter/rk32_mipi_dsi.c
index 73d4a92211255daece372c09d6bc9f5fbd95c4a9..190b1205708a8cd55e713fc29fed3aab6dbabf95 100755 (executable)
--- a/drivers/video/rockchip/transmitter/rk32_mipi_dsi.c
+++ b/drivers/video/rockchip/transmitter/rk32_mipi_dsi.c
@@ -62,7 +62,7 @@
 #include <linux/rockchip/iomap.h>
 #endif
 #ifdef CONFIG_RK32_MIPI_DSI
-#define        MIPI_DBG(x...)  printk(KERN_INFO x)
+#define        MIPI_DBG(x...)  //printk(KERN_INFO x)
 #elif defined CONFIG_RK_3288_DSI_UBOOT
 #define        MIPI_DBG(x...)  //printf( x)
 #define        printk(x...)    //printf( x)
@@ -71,7 +71,7 @@
 #endif
 
 #ifdef CONFIG_MIPI_DSI_LINUX
-#define        MIPI_TRACE(x...)        printk(KERN_INFO x)
+#define        MIPI_TRACE(x...)        //printk(KERN_INFO x)
 #else
 #define        MIPI_TRACE(...)    \
        do\
@@ -90,7 +90,7 @@
 *
 */
 
-#define RK_MIPI_DSI_VERSION_AND_TIME  "rockchip mipi_dsi v1.0 2014-05-08"
+#define RK_MIPI_DSI_VERSION_AND_TIME  "rockchip mipi_dsi v1.0 2014-05-16"
 
 static struct dsi *dsi0;
 static struct dsi *dsi1;
@@ -309,7 +309,7 @@ static int rk32_phy_init(struct dsi *dsi)
        test_data[0] = 0x80 | val << 3 | 0x3;
        rk32_dwc_phy_test_wr(dsi, 0x10, test_data, 1);
        
-       test_data[0] = 0xf;
+       test_data[0] = 0x8;
        rk32_dwc_phy_test_wr(dsi, 0x11, test_data, 1); 
        
        test_data[0] = 0x80 | 0x40;
@@ -1594,11 +1594,11 @@ static int rk32_mipi_dsi_probe(struct platform_device *pdev)
                return dsi->host.irq;
        }
        
-       ret = request_irq(dsi->host.irq, rk32_mipi_dsi_irq_handler, 0,dev_name(&pdev->dev), dsi);
-       if(ret) {
-               dev_err(&pdev->dev, "request mipi_dsi irq fail\n");
-               return -EINVAL;
-       }
+       //ret = request_irq(dsi->host.irq, rk32_mipi_dsi_irq_handler, 0,dev_name(&pdev->dev), dsi);
+       //if(ret) {
+       //      dev_err(&pdev->dev, "request mipi_dsi irq fail\n");
+       //      return -EINVAL;
+       //}
        printk("dsi->host.irq =%d\n",dsi->host.irq); 
 
        disable_irq(dsi->host.irq);
@@ -1663,7 +1663,9 @@ static int rk32_mipi_dsi_probe(struct platform_device *pdev)
        }       
 
        if(id == 1){
-               rk32_init_phy_mode(dsi_screen->lcdc_id);
+
+               if(!support_uboot_display())
+                       rk32_init_phy_mode(dsi_screen->lcdc_id);
                rk_fb_trsm_ops_register(&trsm_dsi_ops, SCREEN_MIPI);
        
 #ifdef MIPI_DSI_REGISTER_IO