RK3288 Android5.1 多MIPI屏的兼容

最新推荐文章于 2024-05-16 00:31:48 发布
最新推荐文章于 2024-05-16 00:31:48 发布
阅读量2.9k 收藏 14
点赞数 1
分类专栏： RK3288_Android
版权声明：本文为博主原创文章，遵循 CC 4.0 BY-SA 版权协议，转载请附上原文出处链接和本声明。
本文链接：https://blog.csdn.net/Mrdeath/article/details/107223663
版权

思路：

1.在dts里配置两套mipi的初始化指令和mipi的hs_clock （假如只有两屏兼容）

2.在uboot阶段读取mipi屏IC的寄存器值mipi.id，根据寄存器值来区分读取都的是那块屏，并加载对应的屏幕数据，最后将该寄存器值mipi.id写入到cmdline里

3.在kernel阶段，去获取cmdline里的mipi.id,根据该值去加载对应的屏参

完整补丁：https://download.csdn.net/download/Mrdeath/12593823

源码分析：

1.dts：

dts代码加了两组hs_clk,和disp_mipi_init_cmds，并要打开uboot logo

rockchip,il9881c,dsi_hs_clk     = <1000>; //il9881c
rockchip,jd9365,dsi_hs_clk     = <434>; //jd9365

disp_mipi_init_cmds1: il9881c-screen-on-cmds {
disp_mipi_init_cmds2: jd9365-screen-on-cmds {
 &fb {
    rockchip,disp-mode = <DUAL>;
-   rockchip,uboot-logo-on = <0>;
+   rockchip,uboot-logo-on = <1>;
    rockchip,disp-policy = <DISPLAY_POLICY_BOX_TEMP>;
 };

 

2.uboot

  1）定义一个rk32_mipi_read_id函数，去读取MIPI寄存器的值，注意读取前需要先写入开屏指令：dcs_set_display_on，读取完后写入关屏指令：dcs_set_display_off

  2）读取完后，将寄存器值接入到cmdline里

 

  3）修改of_property_read_u32(childnode, "rockchip,dsi_hs_clk", &value)函数为：(名字要与dts里相匹配)

            of_property_read_u32(childnode, "rockchip,jd9365,dsi_hs_clk", &value);

            of_property_read_u32(childnode, "rockchip,il9881c,dsi_hs_clk", &value);

            用于区分不同屏的hs_clk加载

  4) 添加COMPAT_ROCKCHIP_MIPI_INIT，为：(名字要与dts里相匹配)

         COMPAT_ROCKCHIP_IL9881C_MIPI_SONCMDS   ，COMPAT(ROCKCHIP_IL9881C_MIPI_SONCMDS, "rockchip,il9881c-screen-on-cmds"),

         COMPAT_ROCKCHIP_JD9365_MIPI_SONCMDS    ， COMPAT(ROCKCHIP_JD9365_MIPI_SONCMDS, "rockchip,jd9365-screen-on-cmds"),

         用于区分不同的screen-on-cmds的加载

diff --git a/u-boot/common/cmd_bootrk.c b/u-boot/common/cmd_bootrk.c
old mode 100755
new mode 100644
index 87b1a85066..b3e6eb8125
--- a/u-boot/common/cmd_bootrk.c
+++ b/u-boot/common/cmd_bootrk.c
@@ -19,6 +19,10 @@ DECLARE_GLOBAL_DATA_PTR;
 extern int g_logo_on_state;
 #endif
  
+#ifdef CONFIG_RK32_DSI
+extern int g_mipi_id;
+#endif
+
 #if defined(CONFIG_RK_HDMI)
 extern int g_hdmi_vic;
 #endif
@@ -457,6 +461,7 @@ static void rk_commandline_setenv(const char *boot_name, rk_boot_img_hdr *hdr, b
    if (g_logo_on_state != 0) {
        snprintf(command_line, sizeof(command_line),
                "%s uboot_logo=0x%08x@0x%08lx", command_line, CONFIG_RK_LCD_SIZE, gd->fb_base);
+
 #if defined(CONFIG_KERNEL_LOGO)
        if (g_rk_fb_size != -1)
            snprintf(command_line, sizeof(command_line),
@@ -465,6 +470,10 @@ static void rk_commandline_setenv(const char *boot_name, rk_boot_img_hdr *hdr, b
    }
 #endif /* CONFIG_RK_FB_DDREND */
  
+   snprintf(command_line, sizeof(command_line),
+                        "%s mipi.id=%d", command_line, g_mipi_id);
+
+
    snprintf(command_line, sizeof(command_line),
            "%s loader.timestamp=%s", command_line, U_BOOT_TIMESTAMP);

diff --git a/u-boot/drivers/video/screen/lcd_mipi.c b/u-boot/drivers/video/screen/lcd_mipi.c
old mode 100755
new mode 100644
index b9e513cd81..3593694d3a
--- a/u-boot/drivers/video/screen/lcd_mipi.c
+++ b/u-boot/drivers/video/screen/lcd_mipi.c
@@ -34,6 +34,7 @@
 #else
 #define    MIPI_SCREEN_DBG(x...) 
 #endif
+
 #ifdef CONFIG_RK32_DSI
 DECLARE_GLOBAL_DATA_PTR;
 #define msleep(a) udelay(a * 1000)
@@ -41,6 +42,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #endif
 static struct mipi_screen *gmipi_screen;
  
+int g_mipi_id = -2;
 static void rk_mipi_screen_pwr_disable(struct mipi_screen *screen)
 {  
    if(screen->lcd_en_gpio != INVALID_GPIO){
@@ -171,6 +173,20 @@ static void rk_mipi_screen_cmd_init(struct mipi_screen *screen)
  
 }
  
+int rockchip_dsi_read_panel_id(int num,int count)
+{
+   int id;
+   unsigned char buf[2] = {0};
+
+   buf[0] = 0xdb;
+   dsi_read_dcs_packet(0, buf, count);
+
+   printf("LOUHN: in rockchip_dsi_read_panel_id--%s:%d, buf[0]=0x%x,buf[1]=0x%x\n", __func__, __LINE__, buf[0],buf[1]);
+  id = ( buf[0] << 8) + buf[1];
+   return id;
+}
+
+
 int rk_mipi_screen(void)
 {
    u8 dcs[16] = {0}, rk_dsi_num;
@@ -255,6 +271,52 @@ int rk_mipi_screen(void)
    return 0;
 }
  
+int read_panel_id(){
+
+   u8 dcs[16] = {0}, rk_dsi_num;
+   rk_dsi_num = gmipi_screen->mipi_dsi_num;
+   //rk_mipi_screen_pwr_enable(gmipi_screen);
+   printf("LOUHN in read_panel_id()\n");      
+   dsi_enable_hs_clk(0,1);
+   dsi_enable_video_mode(0,0);
+   dsi_enable_command_mode(0, 1);
+
+   dcs[0] = LPDT;
+   dcs[1] = DTYPE_DCS_SWRITE_0P;
+   dcs[2] = dcs_exit_sleep_mode;
+  dsi_send_packet(0, dcs, 3);
+   if(rk_dsi_num ==2)  
+       dsi_send_packet(1, dcs, 3);
+  
+   msleep(20);
+   dcs[0] = LPDT;
+   dcs[1] = DTYPE_DCS_SWRITE_0P;
+   dcs[2] = dcs_set_display_on;
+   dsi_send_packet(0, dcs, 3);
+   if(rk_dsi_num ==2)
+        dsi_send_packet(1, dcs, 3);
+
+   msleep(100);
+  
+   g_mipi_id = rockchip_dsi_read_panel_id(1,2);
+   dcs[0] = LPDT;
+   dcs[1] = DTYPE_DCS_SWRITE_0P;
+   dcs[2] = dcs_set_display_off;
+  dsi_send_packet(0, dcs, 3);
+   if(rk_dsi_num ==2)  
+       dsi_send_packet(1, dcs, 3);
+  
+   msleep(20);
+   dcs[0] = LPDT;
+   dcs[1] = DTYPE_DCS_SWRITE_0P;
+   dcs[2] = dcs_enter_sleep_mode;
+   dsi_send_packet(0, dcs, 3);
+   if(rk_dsi_num ==2)
+        dsi_send_packet(1, dcs, 3);
+
+   msleep(20);
+   return g_mipi_id;
+}
 int rk_mipi_screen_standby(u8 enable)
 {
    u8 dcs[16] = {0}, rk_dsi_num;
@@ -307,7 +369,7 @@ static int rk_mipi_screen_init_dt(struct mipi_screen *screen)
    memset(screen, 0, sizeof(*screen));
     
    INIT_LIST_HEAD(&screen->cmdlist_head);
-
+   printf("LOUHN --> in rk_mipi_screen_init_dt\n");
    childnode = of_find_node_by_name(NULL, "mipi_dsi_init");
    if(!childnode ){
        MIPI_SCREEN_DBG("%s: Can not get child => mipi_init.\n", __func__);
@@ -334,8 +396,23 @@ static int rk_mipi_screen_init_dt(struct mipi_screen *screen)
            screen->dsi_lane = value;
            MIPI_SCREEN_DBG("%s: mipi_lcd->dsi_lane = %d.\n", __func__, screen->dsi_lane );
        }
-  
-       ret = of_property_read_u32(childnode, "rockchip,dsi_hs_clk", &value);
+      
+       if(g_mipi_id == 25957)//0x65
+       {
+           ret = of_property_read_u32(childnode, "rockchip,jd9365,dsi_hs_clk", &value);
+           printk("LOUHN: read1 jd9365 mipi ic,value=%d ?\n",value);
+       }
+       else if(g_mipi_id == 0)//0x00
+       {
+           ret = of_property_read_u32(childnode, "rockchip,il9881c,dsi_hs_clk", &value);
+           printf("LOUHN: read il9881c mipi ic,value=%d ?\n ",value);
+       }
+       else
+       {
+           ret = of_property_read_u32(childnode, "rockchip,dsi_hs_clk", &value);
+           printf("LOUHN:Read mipi reg err,is a new mipi screen ?\n ");
+       }      
+
        if (ret) {
            MIPI_SCREEN_DBG("%s: Can not read property: dsi_hs_clk.\n", __func__);
        } else {
@@ -434,8 +511,23 @@ static int rk_mipi_screen_init_dt(struct mipi_screen *screen)
            MIPI_SCREEN_DBG("dsi->lcd_en_gpio=%d, dsi->screen.lcd_en_atv_val=%d\n",screen->lcd_en_gpio,screen->lcd_en_atv_val);
        }
    }
+  
  
-   root= of_find_node_by_name(NULL,"screen-on-cmds");
+   if(g_mipi_id == 25957)//0x65
+   {
+       root = of_find_node_by_name(NULL, "jd9365-screen-on-cmds");
+       printf("LOUHN: read jd9365 mipi ic\n");
+   }
+   else if(g_mipi_id == 0)//0x00
+   {
+       root = of_find_node_by_name(NULL, "il9881c-screen-on-cmds");
+       printf("LOUHN: read il9881c mipi ic\n");
+   }
+   else
+   {
+       root = of_find_node_by_name(NULL, "screen-on-cmds");
+       printf("LOUHN: in read screen-on-cmds, is a new mipi screen ?\n ");
+   }
    if (!root) {
        MIPI_SCREEN_DBG("can't find screen-on-cmds node\n");
    }
@@ -563,7 +655,8 @@ static int rk_mipi_screen_init_dt(struct mipi_screen *screen)
    u32 i,cmds[20];
    int length;
    int err;
-   int node;
+   int id;
+   int node,subnode,rootnode;
    const void *blob;
    struct fdt_gpio_state gpio_val;
    int noffset;
@@ -574,8 +667,26 @@ static int rk_mipi_screen_init_dt(struct mipi_screen *screen)
  
    blob = gd->fdt_blob;//getenv_hex("fdtaddr", 0);
    node = fdtdec_next_compatible(blob, 0, COMPAT_ROCKCHIP_MIPI_INIT);
+   /*
+   rootnode = fdt_path_offset(blob, "/disp_mipi");
+   if (node < 0) {
+       MIPI_SCREEN_DBG("Can not get node of disp_mipi\n");
+   }
+   fdt_for_each_subnode(blob,subnode,rootnode){
+           node = fdtdec_next_compatible(blob, subnode, COMPAT_ROCKCHIP_MIPI_INIT);   
+   */
    if (node < 0) {
        MIPI_SCREEN_DBG("Can not get node of COMPAT_ROCKCHIP_MIPI_INIT\n");
+/*    
+           }
+           id = fdtdec_get_int(blob, node, "rockchip,mipi_id", -1);
+           if (id < 0) {
+               MIPI_SCREEN_DBG("Can not get screen id\n");
+           }
+           printf("read mipi para id = %d,lcd_id=%d\n",id,screen->lcd_id);
+           if(id != screen->lcd_id){
+               continue;
+*/
    }
    screen->screen_init = fdtdec_get_int(blob, node, "rockchip,screen_init", -1);
    if (screen->screen_init < 0) {
@@ -585,7 +696,22 @@ static int rk_mipi_screen_init_dt(struct mipi_screen *screen)
    if (screen->dsi_lane < 0) {
        MIPI_SCREEN_DBG("Can not get dsi_lane\n");
    }
-   screen->hs_tx_clk= fdtdec_get_int(blob, node, "rockchip,dsi_hs_clk", -1);
+
+   if(g_mipi_id == 25957)//0x65
+   {
+       screen->hs_tx_clk= fdtdec_get_int(blob, node, "rockchip,jd9365,dsi_hs_clk", -1);
+       printf("LOUHN: read jd9365 mipi ic,value=%d ?\n ",screen->hs_tx_clk);
+   }
+   else if(g_mipi_id == 0)//0x00
+   {
+       screen->hs_tx_clk= fdtdec_get_int(blob, node, "rockchip,il9881c,dsi_hs_clk", -1);
+       printf("LOUHN: read il9881c mipi ic,value=%d ?\n ",screen->hs_tx_clk);
+   }
+   else
+   {
+       screen->hs_tx_clk= fdtdec_get_int(blob, node, "rockchip,dsi_hs_clk", -1);
+       printf("LOUHN:Read mipi reg err,is a new mipi screen ?\n ");
+   }
    if (screen->hs_tx_clk < 0) {
        MIPI_SCREEN_DBG("Can not get dsi_hs_clk\n");
    } else {
@@ -598,6 +724,7 @@ static int rk_mipi_screen_init_dt(struct mipi_screen *screen)
  
    /* get the lcd rst & en status */
    node = fdtdec_next_compatible(blob, 0, COMPAT_ROCKCHIP_MIPI_PWR);
+//         node = fdtdec_next_compatible(blob, subnode, COMPAT_ROCKCHIP_MIPI_PWR);
    if (node < 0) {
        MIPI_SCREEN_DBG("Can not get node of COMPAT_ROCKCHIP_MIPI_PWR\n");
    } else {
@@ -637,10 +764,27 @@ static int rk_mipi_screen_init_dt(struct mipi_screen *screen)
        }
    }
    /*get the initial command list*/
-   node = fdtdec_next_compatible(blob, 0, COMPAT_ROCKCHIP_MIPI_SONCMDS);
+   if(g_mipi_id == 25957)//0x65
+        {
+       node = fdtdec_next_compatible(blob, 0, COMPAT_ROCKCHIP_JD9365_MIPI_SONCMDS);
+                printf("LOUHN: read jd9365 mipi cmds\n");
+        }
+        else if(g_mipi_id == 0)//0x00
+        {
+                node = fdtdec_next_compatible(blob, 0, COMPAT_ROCKCHIP_IL9881C_MIPI_SONCMDS);
+       printf("LOUHN: read il9881c mipi cmds\n");
+        }
+        else
+        {
+                node = fdtdec_next_compatible(blob, 0, COMPAT_ROCKCHIP_MIPI_SONCMDS);
+       printf("LOUHN: in read screen-on-cmds, is a new mipi screen ?\n ");
+        }
+
    if (node < 0) {
+       printf("LOUHN :read COMPAT_ROCKCHIP_MIPI_SONCMDS err\n");
        MIPI_SCREEN_DBG("Can not get node of COMPAT_ROCKCHIP_MIPI_SONCMDS\n");
    } else {
+       printf("LOUHN :read COMPAT_ROCKCHIP_MIPI_SONCMDS ok\n");
        for (noffset = fdt_first_subnode(blob,node);
        noffset >= 0;
        noffset = fdt_next_subnode(blob, noffset)) {
@@ -676,7 +820,7 @@ static int rk_mipi_screen_init_dt(struct mipi_screen *screen)
 }
 #endif /* CONFIG_OF_LIBFDT */
  
-int rk_mipi_screen_probe(void)
+int rk_mipi_screen_probe(int id)
 {
     int ret = 0;
     gmipi_screen = calloc(1, sizeof(struct mipi_screen));
@@ -684,6 +828,7 @@ int rk_mipi_screen_probe(void)
        printf("request struct screen fail!\n");
        return -ENOMEM;
    }
+    gmipi_screen->lcd_id = id;
 #ifdef CONFIG_OF_LIBFDT
    ret = rk_mipi_screen_init_dt(gmipi_screen);
    if(ret < 0){
diff --git a/u-boot/drivers/video/transmitter/mipi_dsi.h b/u-boot/drivers/video/transmitter/mipi_dsi.h
old mode 100755
new mode 100644
index f4d77a0db8..b5a7558d6b
--- a/u-boot/drivers/video/transmitter/mipi_dsi.h
+++ b/u-boot/drivers/video/transmitter/mipi_dsi.h
@@ -34,6 +34,9 @@
 #define DTYPE_GEN_SWRITE_1P        0x13
 #define DTYPE_GEN_SWRITE_0P        0x03
  
+#define DTYPE_DCS_READ_OP      0x06
+#define DTYPE_GEN_READ_OP      0x04
+#define SET_MAX_RETURN_SIZE        0x37
 //command transmit mode
 #define HSDT           0x00
 #define LPDT           0x01
@@ -283,6 +286,7 @@ struct mipi_screen
     u32 lcd_en_delay;
     u32 lcd_rst_gpio;
     u32 lcd_rst_delay;
+    u32 lcd_id;
  
     struct list_head cmdlist_head;
 };
diff --git a/u-boot/drivers/video/transmitter/rk32_mipi_dsi.c b/u-boot/drivers/video/transmitter/rk32_mipi_dsi.c
old mode 100755
new mode 100644
index 375dfdb87f..2a5c0ff521
--- a/u-boot/drivers/video/transmitter/rk32_mipi_dsi.c
+++ b/u-boot/drivers/video/transmitter/rk32_mipi_dsi.c
@@ -76,7 +76,7 @@ static int rk32_mipi_dsi_is_enable(void *arg, u32 enable);
 int rk_mipi_screen_standby(u8 enable);
  
 DECLARE_GLOBAL_DATA_PTR;
-extern int rk_mipi_screen_probe(void);
+extern int rk_mipi_screen_probe(int);
  
 static void inline writel_relaxed(uint32 val, uint32 addr)
 {
@@ -347,7 +347,6 @@ static int rk312x_phy_power_up(struct dsi *dsi)
    udelay(10);
  
    rk32_dsi_set_bits(dsi, 0xe4, DPHY_REGISTER1);
-   printf("lane = %d\n", dsi->host.lane);
  
    switch (dsi->host.lane) {
    case 4:
@@ -1301,6 +1300,7 @@ static int rk32_mipi_dsi_send_packet(void *arg, unsigned char cmds[], u32 length
    return 0;
 }
  
+#if 0
 static int rk32_mipi_dsi_read_dcs_packet(void *arg, unsigned char *data1, u32 n)
 {
    struct dsi *dsi = arg;
@@ -1343,6 +1343,60 @@ static int rk32_mipi_dsi_read_dcs_packet(void *arg, unsigned char *data1, u32 n)
    msleep(100);
    return 0;
 }
+#else
+static int rk32_mipi_dsi_read_dcs_packet(void *arg, u8 *buf, u32 size)
+{
+   int i;
+   u32 data;
+   u32 reg_val = 0;
+   u32 gen_empty = 0;
+   u32 rd_busy = 0;
+   u8 rd_reg;
+   struct dsi *dsi = arg;
+
+   if ((buf == NULL) || (size == 0))
+       return -1;
+
+   if (rk32_dsi_get_bits(dsi, gen_cmd_full) == 1) {
+       MIPI_DBG("%s: gen_cmd_full\n", __func__);
+       return -1;
+   }
+   /* set bit on max read packet size*/   
+   rk32_dsi_set_bits(dsi, LPDT, max_rd_pkt_size);     
+   //max read packet size is set 3 btye,customer can modify this value,the max value known is 4*/
+   data = (size << 8 )|SET_MAX_RETURN_SIZE; 
+   rk32_dsi_set_bits(dsi, data, GEN_HDR);     
+   udelay(20);
+
+   /* send read command */
+   rk32_dsi_set_bits(dsi, LPDT, dcs_sr_0p_tx);
+
+   /* set back turn-around */
+   rk32_dsi_set_bits(dsi, 1, bta_en);
+
+   rd_reg = buf[0];
+   data = (rd_reg << 8) | DTYPE_DCS_READ_OP;
+   rk32_dsi_set_bits(dsi, data, GEN_HDR);
+
+   udelay(20);
+
+   /* wait command fifo empty and read command fifo is not busy */
+   i = 10;
+   gen_empty = rk32_dsi_get_bits(dsi, gen_cmd_empty);
+   rd_busy = rk32_dsi_get_bits(dsi, gen_rd_cmd_busy);
+   while (!gen_empty && rd_busy && i--) {
+       printf("*");
+       udelay(10);
+   }
+
+   /* get read data from GEN_PLD_DATA */
+   reg_val = rk32_dsi_get_bits(dsi, GEN_PLD_DATA);
+   buf[0] = reg_val & 0xff;
+   buf[1] = (reg_val >> 8) & 0xff;
+
+   return 0;
+}
+#endif
  
 static int rk32_mipi_dsi_power_up(void *arg)
 {
@@ -1874,6 +1928,94 @@ int rk_dsi_host_parse_dt(const void *blob, struct dsi *dsi)
 }
 #endif /* #ifdef CONFIG_OF_LIBFDT */
  
+int rk32_mipi_read_id(vidinfo_t *vid){
+
+   int ret = 0;
+   struct dsi *dsi;
+   struct mipi_dsi_ops *ops;
+   struct rk_screen *screen;
+   struct mipi_dsi_screen *dsi_screen;
+   int id = 0;
+   int i = 3,result = 0;
+   printf("LOUHN in rk32_mipi_read_id \n");   
+   dsi = calloc(1, sizeof(struct dsi));
+   if(!dsi) {
+         MIPI_DBG("request struct dsi.%d fail!\n",id);
+         return -ENOMEM;
+   }
+
+   dsi->dsi_id = id++;
+#ifdef CONFIG_OF_LIBFDT
+   rk_dsi_host_parse_dt(gd->fdt_blob,dsi);
+#endif /* #ifdef CONFIG_OF_LIBFDT */
+   screen = calloc(1, sizeof(struct rk_screen));
+   if(!screen) {
+     MIPI_DBG("request struct rk_screen fail!\n");
+   }
+  
+   ops = &dsi->ops;
+   ops->dsi = dsi;
+   if (cpu_is_rk3288())
+       ops->id = DWC_DSI_VERSION;
+   else if (cpu_is_rk312x())
+       ops->id = DWC_DSI_VERSION_RK312x;
+   else if (cpu_is_rk3368())
+       ops->id = DWC_DSI_VERSION_RK3368;
+   else
+       ops->id = DWC_DSI_VERSION_ERR;
+
+   ops->get_id = rk32_mipi_dsi_get_id,
+   ops->dsi_send_packet = rk32_mipi_dsi_send_packet;
+   ops->dsi_read_dcs_packet = rk32_mipi_dsi_read_dcs_packet,
+   ops->dsi_enable_video_mode = rk32_mipi_dsi_enable_video_mode,
+   ops->dsi_enable_command_mode = rk32_mipi_dsi_enable_command_mode,
+   ops->dsi_enable_hs_clk = rk32_mipi_dsi_enable_hs_clk,
+   ops->dsi_is_active = rk32_mipi_dsi_is_active,
+   ops->dsi_is_enable= rk32_mipi_dsi_is_enable,
+   ops->power_up = rk32_mipi_dsi_power_up,
+   ops->power_down = rk32_mipi_dsi_power_down,
+   ops->dsi_init = rk_mipi_dsi_init,
+
+   dsi_screen = &dsi->screen;
+   dsi_screen->type = screen->type = vid->screen_type;
+   dsi_screen->face = screen->face = vid->lcd_face;
+   dsi_screen->pixclock = screen->mode.pixclock = vid->vl_freq;
+   dsi_screen->left_margin = screen->mode.left_margin = vid->vl_hbpd;
+   dsi_screen->right_margin = screen->mode.right_margin = vid->vl_hfpd;
+   dsi_screen->hsync_len = screen->mode.hsync_len = vid->vl_hspw;
+   dsi_screen->upper_margin = screen->mode.upper_margin = vid->vl_vbpd;
+   dsi_screen->lower_margin = screen->mode.lower_margin = vid->vl_vfpd;
+   dsi_screen->vsync_len = screen->mode.vsync_len = vid->vl_vspw;
+   dsi_screen->x_res = screen->mode.xres = vid->vl_width;
+   dsi_screen->y_res = screen->mode.yres = vid->vl_height;
+   dsi_screen->pin_hsync = screen->pin_hsync = vid->vl_hsp;
+   dsi_screen->pin_vsync = screen->pin_vsync = vid->vl_vsp;
+   dsi_screen->pin_den = screen->pin_den = vid->vl_oep;
+   dsi_screen->lcdc_id = 1;
+   dsi_screen->dsi_lane = 4;
+   dsi_screen->hs_tx_clk = 550000000;
+   dsi->dsi_id = 0;
+   sprintf(ops->name, "rk_mipi_dsi.%d", dsi->dsi_id);
+   ret = rk_mipi_dsi_probe(dsi);
+   if(ret) {
+     MIPI_DBG("rk mipi_dsi probe fail!\n");
+     MIPI_DBG("%s\n", RK_MIPI_DSI_VERSION_AND_TIME);
+   }  
+  
+   if(id == 1){
+       rk_init_phy_mode(vid->lcdc_id);
+       dsi0 = dsi;
+   }else{  
+     dsi1 = dsi;
+   }
+      
+   rk_mipi_dsi_init(dsi,0);
+   //while((i-- > 0) && (result == 0))
+      result = read_panel_id();
+   
+  return result; 
+}
+
 int rk32_mipi_enable(vidinfo_t *vid)
 {
    int ret = 0;
@@ -1883,8 +2025,7 @@ int rk32_mipi_enable(vidinfo_t *vid)
    struct mipi_dsi_screen *dsi_screen;
    static int id = 0;
    u8 dsi_number = 0;
-  
-   rk_mipi_screen_probe();
+   rk_mipi_screen_probe(vid->lcd_id);
  
    dsi_number = rk_mipi_get_dsi_num();
    MIPI_DBG("dsi number is %d\n", dsi_number);
diff --git a/u-boot/include/fdtdec.h b/u-boot/include/fdtdec.h
index 45e3e63809..b126bf9c71 100755
--- a/u-boot/include/fdtdec.h
+++ b/u-boot/include/fdtdec.h
@@ -114,7 +114,9 @@ enum fdt_compat_id {
    COMPAT_ROCKCHIP_DSIHOST,    /*RockChip DSI host Controller*/
    COMPAT_ROCKCHIP_MIPI_INIT,  /*RockChip MIPI init*/
    COMPAT_ROCKCHIP_MIPI_PWR,   /*RockChip MIPI pwr*/
-   COMPAT_ROCKCHIP_MIPI_SONCMDS,   /*RockChip MIPI screen on cmds*/
+   COMPAT_ROCKCHIP_MIPI_SONCMDS,   /*RockChip MIPI screen on cmds*/
+   COMPAT_ROCKCHIP_IL9881C_MIPI_SONCMDS,   /*RockChip MIPI screen on cmds*/
+   COMPAT_ROCKCHIP_JD9365_MIPI_SONCMDS,   /*RockChip MIPI screen on cmds*/
    COMPAT_ROCKCHIP_MIPI_ONCMDS,    /*RockChip MIPI screen on cmd*/
    COMPAT_ROCKCHIP_MIPI_LCD_DT,    /*RockChip MIPI screen display timing */
    COMPAT_ROCKCHIP_MIPI_LCD_RST,   /*RockChip MIPI screen rst pin */
diff --git a/u-boot/include/lcd.h b/u-boot/include/lcd.h
old mode 100755
new mode 100644
index 32e6b73ab3..172884129f
--- a/u-boot/include/lcd.h
+++ b/u-boot/include/lcd.h
@@ -340,7 +340,7 @@ typedef struct vidinfo {
    unsigned int sclk_div;
  
    unsigned int dual_lcd_enabled;
-      
+   int lcd_id;
  
        u_char screen_type;
        u_char lvds_ch_nr;
diff --git a/u-boot/lib/fdtdec.c b/u-boot/lib/fdtdec.c
index 4ed39232d4..f04a27d675 100755
--- a/u-boot/lib/fdtdec.c
+++ b/u-boot/lib/fdtdec.c
@@ -74,6 +74,8 @@ static const char * const compat_names[COMPAT_COUNT] = {
    COMPAT(ROCKCHIP_MIPI_INIT, "rockchip,mipi_dsi_init"),
    COMPAT(ROCKCHIP_MIPI_PWR, "rockchip,mipi_power_ctr"),
    COMPAT(ROCKCHIP_MIPI_SONCMDS, "rockchip,screen-on-cmds"),
+   COMPAT(ROCKCHIP_IL9881C_MIPI_SONCMDS, "rockchip,il9881c-screen-on-cmds"),
+   COMPAT(ROCKCHIP_JD9365_MIPI_SONCMDS, "rockchip,jd9365-screen-on-cmds"),
    COMPAT(ROCKCHIP_MIPI_ONCMDS, "rockchip,on-cmds"),
    COMPAT(ROCKCHIP_MIPI_LCD_DT, "rockchip,display-timings"),
    COMPAT(ROCKCHIP_MIPI_LCD_RST, "rockchip,lcd_rst"),

3.kernel

1)读取cmdline里保存的寄存器值

2）修改of_property_read_u32(childnode, "rockchip,dsi_hs_clk", &value)函数为：(名字要与dts里相匹配)

            of_property_read_u32(childnode, "rockchip,jd9365,dsi_hs_clk", &value);

            of_property_read_u32(childnode, "rockchip,il9881c,dsi_hs_clk", &value);

            用于区分不同屏的hs_clk加载

3）修改of_find_node_by_name(NULL, "screen-on-cmds");函数为：(名字要与dts里相匹配)

           of_find_node_by_name(NULL, "jd9365-screen-on-cmds");

           of_find_node_by_name(NULL, "il9881c-screen-on-cmds");

             用于区分不同屏的screen-on-cmds加载

@@ -323,8 +353,22 @@ static int rk_mipi_screen_init_dt(struct device *dev,
            screen->dsi_lane = value;
            MIPI_SCREEN_DBG("%s: mipi_lcd->dsi_lane = %d.\n", __func__, screen->dsi_lane);
        }
-
-       ret = of_property_read_u32(childnode, "rockchip,dsi_hs_clk", &value);
+          
+       if(mipi_id_int == 25957)//0x65
+       {
+           ret = of_property_read_u32(childnode, "rockchip,jd9365,dsi_hs_clk", &value);
+            printk("LOUHN: read jd9365 mipi ic,value=%d ?\n ",value);
+       }
+       else if(mipi_id_int == 0)//0x00
+       {
+           ret = of_property_read_u32(childnode, "rockchip,il9881c,dsi_hs_clk", &value);
+           printk("LOUHN: read il9881c mipi ic,value=%d ?\n ",value);
+       }
+       else
+       {
+           ret = of_property_read_u32(childnode, "rockchip,dsi_hs_clk", &value);
+           printk("LOUHN:Read mipi reg err,is a new mipi screen ?\n ");
+       }  
        if (ret) {
            MIPI_SCREEN_DBG("%s: Can not read property: dsi_hs_clk.\n", __func__);
        } else {
@@ -419,8 +463,22 @@ static int rk_mipi_screen_init_dt(struct device *dev,
            MIPI_SCREEN_DBG("dsi->lcd_en_gpio=%d, dsi->screen.lcd_en_atv_val=%d\n", screen->lcd_en_gpio, screen->lcd_en_atv_val);
        }
    }
+   if(mipi_id_int == 25957)//0x65
+   {
+       root = of_find_node_by_name(NULL, "jd9365-screen-on-cmds");
+       printk("LOUHN: read jd9365 mipi ic\n");
+   }
+   else if(mipi_id_int == 0)//0x00
+   {
+       root = of_find_node_by_name(NULL, "il9881c-screen-on-cmds");
+       printk("LOUHN: read il9881c mipi ic\n");
+   }
+   else
+   {
+           root = of_find_node_by_name(NULL, "screen-on-cmds");
+       printk("LOUHN: in read screen-on-cmds, is a new mipi screen ?\n ");
+   }
  
-   root = of_find_node_by_name(NULL, "screen-on-cmds");
    if (!root) {
        MIPI_SCREEN_DBG("can't find screen-on-cmds node\n");
    } else {
@@ -567,7 +625,22 @@ static int rk_mipi_screen_init_dt(struct mipi_screen *screen)
    if (screen->dsi_lane < 0) {
        MIPI_SCREEN_DBG("Can not get dsi_lane\n");
    }
-   screen->hs_tx_clk = fdtdec_get_int(blob, node, "rockchip,dsi_hs_clk", -1);
+   if(mipi_id_int == 25957)//0x65
+        {
+       screen->hs_tx_clk = fdtdec_get_int(blob, node, "rockchip,jd9365,dsi_hs_clk", -1);
+           printk("LOUHN:Read jd9365,dsi_hs_clk\n "); 
+   }
+        else if(mipi_id_int == 0)//0x00
+        {
+       screen->hs_tx_clk = fdtdec_get_int(blob, node, "rockchip,il9881c,dsi_hs_clk", -1);
+                printk("LOUHN:Read il9881c,dsi_hs_clk\n ");  
+        }
+        else
+        {
+           screen->hs_tx_clk = fdtdec_get_int(blob, node, "rockchip,dsi_hs_clk", -1);
+       printk("LOUHN:Read mipi reg err,is a new mipi screen ?\n ");
+        }
+
    if (screen->hs_tx_clk < 0) {
        MIPI_SCREEN_DBG("Can not get dsi_hs_clk\n");
    } else {
@@ -717,6 +790,7 @@ int rk_mipi_screen_probe(void)
 {
    int ret = 0;
    gmipi_screen = calloc(1, sizeof(struct mipi_screen));
+
    if (!gmipi_screen) {
        printf("request struct screen fail!\n");
        return -ENOMEM;
@@ -738,7 +812,11 @@ int rk_mipi_screen_probe(void)
 static int __init rk_mipi_screen_probe(struct platform_device *pdev)
 {
    static int ret;
-
+  
+   get_cmdline_str(saved_command_line,"mipi.id=",mipi_id_string);  //获取mipi.id值，保存到mipi_id_string
+   kstrtoint(mipi_id_string, 0, &mipi_id_int);
+   printk("LOUHN in rk_mipi_screen_probe,mipi.id=%d\n",mipi_id_int);
+   printk("LOUHN:cmdline=%s\n",saved_command_line);   
    gmipi_screen = devm_kzalloc(&pdev->dev, sizeof(struct mipi_screen), GFP_KERNEL);
    if (!gmipi_screen) {
        dev_err(&pdev->dev, "request struct screen fail!\n");

 

风在摇曳风铃
关注
  • 1
    点赞
  • 踩
  • 14
    收藏
    觉得还不错? 一键收藏
  • 0
    评论
专栏目录
基于RK3568的Android11 适配 MIPI 屏幕
qq_24093081的博客
04-02 1198
在本小节会学习到如何适配Mipi接口屏幕到RK3568的开发板上。提示：以下是本篇文章正文内容，下面案例可供参考未完，待更新。
3399的一个小需求-mipi适应多个lcd屏显示
嵌入式 arm 单片机 入门 视频 培训
12-08 394
最近遇到一个问题，做了一个3399的板子，这个板子引出了一个mipi显示接口，然而，这个接口呢又需要连接不同的屏幕，比如一个5寸的，一个7寸的。我看到初始化序列，我想着能不能用初始化序列的办法，反过来读取数据呢？然而，内核直接崩了，（可能原因是不能读，或者我的方法（也是百度的）有问题）这不是难坏了我，百度了一圈，也没看到个解决方法，毕竟我对这块也不是很熟悉。客户觉得这样不便于维护，一定要我弄成一个版本，自动完成识别显示功能。软件到我手上的时候，就是分成连个内核，一个用于5寸，一个用于7寸。
展锐平台mipi寄存器读写
ruidongren的专栏
12-15 1418
:/sys/class/display/dsi # echo 0xfc 0x01 > gen_read && cat gen_read echo 0xfc 0x01 > gen_read && cat gen_read echo 0xb1 0x01 > gen_read && cat gen_read echo 0xb1 0x18 > gen_write echo 0xb1 0x01 > gen_read &am
RK3568 MIPI驱动JD9365A触摸屏调试过程_mipi屏幕驱动
最新发布
2401_85014296的博客
05-16 785
/0xE0寄存器地址, 0x01数据个数， 0x00寄存器写入数据。
理解mipi协议
kerson的专栏
05-21 5196
2015-12-07 12:16 951人阅读 评论(0) 收藏 举报  分类：   LCD驱动（3）  版权声明：本文为博主原创文章，未经博主允许不得转载。 完成mipi信号通道分配后，需要生成与物理层对接的时序、同步信号：  MIPI规定，传输过程中，包内是200mV、包间以及包启动和包结束时是1.2V，两种不同的电压摆幅，需要两组不同的LVDS
快来戳！快来戳！天嵌A40I平台如何调试10.1寸MIPI屏？这份总结收好！
m0_72523456的博客
03-11 343
驱动通过mipi接口下发mipi屏寄存器初始化参数，由于全志平台没有将这些初始化参数通过dtsi设备树文件解析传给驱动，所以无法在dtsi设备树文件里面配置mipi屏寄存器初始化参数，只能在对应mipi屏驱动里面改，当前配置的是tft720x1280，所以我们需要修改。mipi屏复位脚，根据原理图上DSI_RST所接gpio口配置，默认置高，复位信号是先拉高延时100ms，再拉低延时100ms，最后再拉高延时100ms就可以初始化mipi屏寄存器参数，一般mipi都需要复位才能正常初始化屏;
RK3399-新老MIPI屏兼容问题
DD'Notes
09-27 1273
分析主要思路就是初始化屏幕之前，先读取驱动IC的ID，然后通过不同的ID去使用DTS里面的不同初始化参数，也可。链接: https://notes.z-dd.online/2020/09/06/RK3399-%E6%96%B0%E8%80%81MIPI%E5%B1%8F%E5%85%BC%E5%AE%B9%E9%97%AE%E9%A2%98/主要思路就是初始化屏幕之前，先读取驱动IC的ID，然后通过不同的ID去使用DTS里面的不同初始化参数，也可以通过读取不同的ID来加载不同的DTS。
rk3288-5.1fromwork.class
12-22
rk3288-5.1fromwork.class
RK3288 mipi屏参数配置文件.pdf
05-14
RK3288 mipi屏参数配置文件.pdf
bt1120转mipi输入到rk3288参照代码
07-07
rk3288平台，使用龙讯LT8918芯片将bt1120信号转换为mipi信号输入到rk3288，以上文件为调试记录，原始代码和调试后的代码进行对比参照
RK3288 5.1色温调节.7z
09-28
然而，多屏显示系统中色温一致性的问题需要专门的工具和方法来解决，因此"RK3288 5.1色温调节.7z"提供的解决方案对于优化用户体验至关重要。 总之，掌握正确的色温调节技巧，结合RockChip RK3288芯片的特性和提供的...
rk3288-mipi-csi-host-controller-pdf.zip
04-27
mipi-rk3288-chapter-35-mipi-csi-phy rk3288-chapter-36-mipi-csi-2-host-controller .rk3288-chapter-37-mipi-controller.[RK3288_Android6.0-MID-SDK]双屏异显使用说明 V2.00-20170912 rk3288 mipi 相关文档
MIPI 屏幕适配
501846585_QQAndroid_java
12-27 1160
MRF TOOL工具配置MIPI屏.
MIPI学习记录——（4）mipi数据流实现
dkmknjk的博客
06-17 2147
数据流实现 数据流接收过程： 1.sensor发送过来的数据，通过data lane到达D-PHY。 2.D-PHY将接收到的data buffer缓存到内部DMA。 3.CPU将DDR中的buffer table地址（0x???）写入到D-PHY的寄存器（CHANNELLn_FADDRn，n表示数字0~9）。 4.D-PHY根据该buffer table地址，通过内部DMA将buffer缓存区内的有效buffer传送到DDR。 5.CPU通过系统DMA，从DDR取出buffer table，送到目的地（
LCD之mipi DSI接口驱动调试流程
热门推荐
产品线负责人
03-31 5万+
笔者先后接触开发Camera和LCD相关模块，今天以LCD MIPI为例做简要讨论。Display对应MIPI DSI，Camera对应MIPI CSI。
mipi屏点屏注意点
从ok6410开始
11-02 7401
手机屏通常都是mipi屏，使用的是DSI接口的屏，一般有3或4对数据线，1对时钟线。 没有mipi输出接口的芯片通常加一颗转换芯片来点mipi屏，注意点如下： 1、转接芯片的初始化与命令输入一般有2种通讯接口，IIC和SPI，首先写好通讯协议，不同的芯片可能略有差别，需要把重新包装下 2、确认通讯是否正常，通常读转接芯片的ID，读出来是正确的基本能确定与转接芯片通讯正常。 3、写入转接...
rk3128有多少个bank_请教： rk3128 点10.1寸1024x600 lvds屏出现显示两个
weixin_39607710的博客
01-30 515
本帖最后由 hquhjq 于 2019-11-6 11:47 编辑各位好！我在rk3128 android5.1上去点一个 10.1寸的1024x600的lvds屏；现在屏点亮了，但显示效果有问题；在uboot中，看显示效果应该是正常的；进入android显示异常，出现上下两个android 界面，但是插入Hdmi线接到显示器，则两个显示正常。请问这个是什么原因？dts文件及屏参文件修改如下：&a...
海思HI3516 MIPI屏幕调试笔记
warren103098的博客
07-27 4349
海思HI3516 DV300 配置mipi屏幕的相关配置过程以及知识点
高通平台mipi panel kernel读包方法
Focus on the Linux kernel
08-23 1万+
熟悉高通平台mipi panel kernel读包方法，我想我们可以是的同一客户要是使用2块mipi panel的话我想我们可以通过读取id来下不同序列而不用更换boot.img，还有能否读id可以说明mipi通讯是否正常。 还有我们只需在lk下面读一次id再对全局变量赋值通过lk传递到kernel里面，通过不同赋值发送不同初始化序列，至于时序clk则调整好兼容2块屏的，也可以通过全局变量来区分
rk3288所罗门mipi电路
11-22
所罗门电路可以同时连接多个MIPI显示屏，实现多屏显示。通过RK3288芯片的高性能和MIPI接口的优势，在移动设备中可以实现高质量的图像和音频传输。 总结来说，RK3288所罗门MIPI电路是一种用于驱动MIPI显示屏的电路，...

“相关推荐”对你有帮助么？

  • 非常没帮助
  • 没帮助
  • 一般
  • 有帮助
  • 非常有帮助
提交
评论
添加红包

请填写红包祝福语或标题

个

红包个数最小为10个

元

红包金额最低5元

当前余额3.43元 前往充值 >
需支付：10.00元
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付元
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明：

1.余额是钱包充值的虚拟货币，按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载，可以购买VIP、付费专栏及课程。

余额充值