From 5ca8c1360c5cb118477d84798dcbff84f5825e62 Mon Sep 17 00:00:00 2001
From: libing <libing@rock-chips.com>
Date: Mon, 10 Mar 2014 17:34:51 +0800
Subject: [PATCH] rk mipi dsi: dsi file:lcd-rockchip_mipi.dtsi support rk3288.
---
arch/arm/boot/dts/lcd-rockchip_mipi.dtsi | 94 ++++++
drivers/video/rockchip/transmitter/mipi_dsi.h | 12 +
.../rockchip/transmitter/rk616_mipi_dsi.c | 273 +++++++++++++++++-
.../rockchip/transmitter/rk616_mipi_dsi.h | 15 +
4 files changed, 382 insertions(+), 12 deletions(-)
create mode 100755 arch/arm/boot/dts/lcd-rockchip_mipi.dtsi
mode change 100644 => 100755 drivers/video/rockchip/transmitter/mipi_dsi.h
mode change 100644 => 100755 drivers/video/rockchip/transmitter/rk616_mipi_dsi.c
mode change 100644 => 100755 drivers/video/rockchip/transmitter/rk616_mipi_dsi.h
diff --git a/arch/arm/boot/dts/lcd-rockchip_mipi.dtsi b/arch/arm/boot/dts/lcd-rockchip_mipi.dtsi
new file mode 100755
index 000000000000..288e2daeec37
--- /dev/null
+++ b/arch/arm/boot/dts/lcd-rockchip_mipi.dtsi
@@ -0,0 +1,94 @@
+/*
+ * RockChip. LCD_B101ew05
+ *
+ */
+
+/ {
+ mipidsi:rkmipi{
+
+ compatible = "rockchip,mipi_dsi";
+ disp_mipi_init: mipi_dsi_init{
+ screen_init = <0>;
+ dsi_lane = <4>;
+ dsi_hs_clk = <528>;
+ mipi_screen_id = <0>;
+ };
+
+ disp_mipi_power_ctr: mipi_power_ctr {
+ mipi_lcd_rst:mipi_lcd_rst{
+ gpios = <&gpio0 GPIO_A2 GPIO_ACTIVE_HIGH>;
+ delay = <1000>;
+ };
+ mipi_lcd_en:mipi_lcd_en {
+ gpios = <&gpio0 GPIO_B0 GPIO_ACTIVE_LOW>;
+ delay = <100>;
+ };
+ };
+ disp_mipi_init_cmds: panel-on-cmds {
+ rockchip,cmd_debug = <1>;
+ on-cmds1 {
+ rockchip,cmd_type = <1>;
+ cmd = <0xaa 0xab 0xac 0xad 0xae 0xaf 0xa1 0xa2 0xa3 0xa4 0xa5>;
+ rockchip,cmd_delay = <120>;
+ };
+
+ on-cmds2 {
+ rockchip,cmd_type = <2>;
+ cmd = <0x1a 0x1b 0x1c 0x1d 0x1e 0x1f 0x11 0x12 0x13 0x14 0x15>;
+ rockchip,cmd_delay = <110>;
+ };
+ on-cmds3 {
+ rockchip,cmd_type = <3>;
+ cmd = <0x1a 0x2a 0x3a 0x4a 0x5a 0x6a 0x7a>;
+ rockchip,cmd_delay = <101>;
+ };
+ };
+ disp_power_ctr: power_ctr {
+ rockchip,debug = <0>;
+ lcd_en:lcd_en {
+ rockchip,power_type = <GPIO>;
+ gpios = <&gpio0 GPIO_B0 GPIO_ACTIVE_HIGH>;
+ rockchip,delay = <10>;
+ };
+
+ /* bl_en:bl_en {
+ rockchip,power_type = <GPIO>;
+ gpios = <&gpio0 GPIO_A2 GPIO_ACTIVE_HIGH>;
+ rockchip,delay = <10>;
+ };
+
+ lcd_rst:lcd_rst {
+ rockchip,power_type = <REGULATOR>;
+ rockchip,delay = <5>;
+ rockchip,delay = <10>;
+ };*/
+ };
+
+
+
+ disp_timings: display-timings {
+ native-mode = <&timing0>;
+ timing0: timing0 {
+ screen_type = <SCREEN_LVDS>;
+ lvds_format = <LVDS_8BIT_2>;
+ out_face = <OUT_D888_P666>;
+ clock-frequency = <71000000>;
+ hactive = <1280>;
+ vactive = <800>;
+ hback-porch = <100>;
+ hfront-porch = <18>;
+ vback-porch = <8>;
+ vfront-porch = <6>;
+ hsync-len = <10>;
+ vsync-len = <2>;
+ hsync-active = <0>;
+ vsync-active = <0>;
+ de-active = <0>;
+ pixelclk-active = <0>;
+ swap-rb = <0>;
+ swap-rg = <0>;
+ swap-gb = <0>;
+ };
+ };
+ };
+};
diff --git a/drivers/video/rockchip/transmitter/mipi_dsi.h b/drivers/video/rockchip/transmitter/mipi_dsi.h
old mode 100644
new mode 100755
index 0cc37f8189cf..352ac579ff7d
--- a/drivers/video/rockchip/transmitter/mipi_dsi.h
+++ b/drivers/video/rockchip/transmitter/mipi_dsi.h
@@ -218,10 +218,22 @@ struct mipi_dsi_screen {
u8 dsi_lane;
u8 dsi_video_mode;
u32 hs_tx_clk;
+#if defined(CONFIG_ARCH_RK3288)
+ u8 screen_init;
+ u8 mipi_screen_id;
+ int lcd_rst_gpio;
+ int lcd_rst_delay;
+ u8 lcd_rst_atv_val;
+
+ int lcd_en_gpio;
+ int lcd_en_dealay;
+ u8 lcd_en_atv_val;
+#else
/* Operation function*/
int (*init)(void);
int (*standby)(u8 enable);
+#endif
};
diff --git a/drivers/video/rockchip/transmitter/rk616_mipi_dsi.c b/drivers/video/rockchip/transmitter/rk616_mipi_dsi.c
old mode 100644
new mode 100755
index 65792b962302..ab9aaeddb8db
--- a/drivers/video/rockchip/transmitter/rk616_mipi_dsi.c
+++ b/drivers/video/rockchip/transmitter/rk616_mipi_dsi.c
@@ -65,6 +65,14 @@
#include "mipi_dsi.h"
#include "rk616_mipi_dsi.h"
+
+#ifdef CONFIG_OF
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
+#endif
+
+
#if 1
#define MIPI_DBG(x...) printk(KERN_INFO x)
#else
@@ -925,7 +933,9 @@ static int rk_mipi_dsi_init(void *arg, u32 n)
rk_mipi_dsi_host_power_up(dsi);
rk_mipi_dsi_phy_init(dsi);
rk_mipi_dsi_host_init(dsi);
+#if defined(CONFIG_ARCH_RK3288)
+#else
if(!screen->init) {
rk_mipi_dsi_enable_hs_clk(dsi, 1);
#ifndef CONFIG_MIPI_DSI_FT
@@ -941,7 +951,7 @@ static int rk_mipi_dsi_init(void *arg, u32 n)
} else {
screen->init();
}
-
+#endif
/*
After the core reset, DPI waits for the first VSYNC active transition to start signal sampling, including
pixel data, and preventing image transmission in the middle of a frame.
@@ -1180,7 +1190,7 @@ static int rk_mipi_dsi_send_gen_packet(void *arg, void *data, u32 n)
static int rk_mipi_dsi_read_dcs_packet(void *arg, unsigned char *data, u32 n)
{
- struct dsi *dsi = arg;
+// struct dsi *dsi = arg;
//DCS READ
return 0;
}
@@ -1638,12 +1648,226 @@ static irqreturn_t rk616_mipi_dsi_irq_handler(int irq, void *data)
}
#endif
-static int rk616_mipi_dsi_get_screen(void) {
- return 0;
+#if CONFIG_OF
+
+static int mipi_dsi_get_screen_dt(struct device *dev,struct dsi *dsi)
+{
+ struct device_node *node = dev->of_node;
+ struct device_node *childnode, *grandchildnode,*root;
+ struct mipi_dcs_cmd_ctr_list *dcs_cmd;
+ struct list_head *pos;
+ struct property *prop;
+ enum of_gpio_flags flags;
+ const char *pin_funcs, *strings;
+ u32 value,i,debug,gpio,ret,cmds[20],length;
+
+ if (!node)
+ return -ENODEV;
+
+ memset(dsi, 0, sizeof(*dsi));
+ INIT_LIST_HEAD(&dsi->cmdlist_head);
+
+ childnode = of_get_child_by_name(node, "mipi_dsi_init");
+ if(!childnode )
+ {
+ printk("%s: Can not get child => mipi_init.\n", __func__);
+ }
+ else
+ {
+ ret = of_property_read_u32(childnode, "screen_init", &value);
+ if (ret) {
+ printk("%s: Can not read property: screen_init.\n", __func__);
+ } else {
+ dsi->screen.screen_init = value;
+ printk("%s: dsi->screen->screen_init = %d.\n", __func__, dsi->screen.screen_init );
+ }
+
+ ret = of_property_read_u32(childnode, "dsi_lane", &value);
+ if (ret) {
+ printk("%s: Can not read property: dsi_lane.\n", __func__);
+ } else {
+ dsi->screen.dsi_lane = value;
+ printk("%s: dsi->screen.dsi_lane = %d.\n", __func__, dsi->screen.dsi_lane );
+ }
+
+ ret = of_property_read_u32(childnode, "dsi_hs_clk", &value);
+ if (ret) {
+ printk("%s: Can not read property: dsi_hs_clk.\n", __func__);
+ } else {
+ dsi->screen.hs_tx_clk = value;
+ printk("%s: dsi->screen->hs_tx_clk = %d.\n", __func__, dsi->screen.hs_tx_clk );
+ }
+
+ ret = of_property_read_u32(childnode, "mipi_screen_id", &value);
+ if (ret) {
+ printk("%s: Can not read property: mipi_screen_id.\n", __func__);
+ } else {
+ dsi->screen.mipi_screen_id = value ;
+ printk("%s: dsi->screen.mipi_screen_id = %d.\n", __func__, dsi->screen.mipi_screen_id );
+ }
+ }
+
+
+ childnode = of_get_child_by_name(node, "mipi_power_ctr");
+ if(!childnode )
+ {
+ printk("%s: Can not get child => mipi_power_ctr.\n", __func__);
+ }
+ else
+ {
+ grandchildnode = of_get_child_by_name(childnode, "mipi_lcd_rst");
+ if (!grandchildnode)
+ {
+ printk("%s: mipi_lcd_rst = %d.\n", __func__, value );
+ }
+ else
+ {
+ ret = of_property_read_u32(grandchildnode, "delay", &value);
+ if (ret)
+ {
+ printk("%s: Can not read property: delay.\n", __func__);
+ }
+ else
+ {
+ dsi->screen.lcd_rst_delay = value;
+ printk("%s: dsi->screen->lcd_rst_delay = %d.\n", __func__, dsi->screen.lcd_rst_delay );
+ }
+
+ gpio = of_get_named_gpio_flags(grandchildnode, "gpios", 0, &flags);
+ if (!gpio_is_valid(gpio)){
+ printk("rest: Can not read property: %s->gpios.\n", __func__);
+ }
+
+ ret = gpio_request(gpio,"mipi_lcd_rst");
+ if (ret) {
+ printk("request mipi_lcd_rst gpio fail:%d\n",gpio);
+ return -1;
+ }
+
+ dsi->screen.lcd_rst_gpio = gpio;
+ dsi->screen.lcd_rst_atv_val = flags;
+
+ printk(
"dsi->screen.lcd_rst_gpio=%d,dsi->screen.lcd_rst_atv_val=%d\n",dsi->screen.lcd_rst_gpio,dsi->screen.lcd_rst_atv_val);
+ }
+
+ grandchildnode = of_get_child_by_name(childnode, "mipi_lcd_en");
+ if (!grandchildnode)
+ {
+ printk("%s: Can not read property: mipi_lcd_en.\n", __func__);
+ }
+ else
+ {
+ ret = of_property_read_u32(grandchildnode, "delay", &value);
+ if (ret)
+ {
+ printk("%s: Can not read property: mipi_lcd_en-delay.\n", __func__);
+ }
+ else
+ {
+ dsi->screen.lcd_en_dealay = value;
+ printk("%s: dsi->screen.lcd_en_dealay = %d.\n", __func__, dsi->screen.lcd_en_dealay );
+ }
+
+ gpio = of_get_named_gpio_flags(grandchildnode, "gpios", 0, &flags);
+ if (!gpio_is_valid(gpio)){
+ printk("rest: Can not read property: %s->gpios.\n", __func__);
+ }
+ dsi->screen.lcd_en_gpio = gpio;
+ dsi->screen.lcd_en_atv_val= flags;
+ printk(
"dsi->screen.lcd_en_gpio=%d, dsi->screen.lcd_en_atv_val=%d\n",dsi->screen.lcd_en_gpio,dsi->screen.lcd_en_atv_val);
+ }
+ }
+
+ root= of_find_node_by_name(node,"panel-on-cmds");
+ if (!root) {
+ printk("can't find panel-on-cmds node\n");
+ return -ENODEV;
+ }
+ else
+ {
+ for_each_child_of_node(root, childnode)
+ {
+ dcs_cmd = kmalloc(sizeof(struct mipi_dcs_cmd_ctr_list), GFP_KERNEL);
+ strcpy(dcs_cmd->dcs_cmd.name, childnode->name);
+
+ prop = of_find_property(childnode, "cmd", &length);
+ if (!prop)
+ {
+ printk("Can not read property: cmds\n");
+ return -EINVAL;
+ }
+
+ printk("length=%d\n\n",(length / sizeof(u32)));
+
+ ret = of_property_read_u32_array(childnode, "cmd", cmds, (length / sizeof(u32)));
+ if(ret < 0)
+ {
+ printk("%s: Can not read property: %s--->cmds\n", __func__,childnode->name);
+ return ret;
+ }
+ else
+ {
+ for(i = 0; i < (length / sizeof(u32)); i++)
+ {
+ printk("cmd[%d]=%02x£¬",i+1,cmds[i]);
+ dcs_cmd->dcs_cmd.cmds[i] = cmds[i];
+ }
+ //printk("\n");
+ }
+
+ ret = of_property_read_u32(childnode, "rockchip,cmd_type", &value);
+ if(ret)
+ {
+ printk("%s: Can not read property: %s--->cmd_type\n", __func__,childnode->name);
+ }
+ else
+ {
+ dcs_cmd->dcs_cmd.type = value;
+ }
+
+ ret = of_property_read_u32(childnode, "rockchip,cmd_delay", &value);
+ if(ret)
+ {
+ printk("%s: Can not read property: %s--->cmd_delay\n", __func__,childnode->name);
+ }
+ else
+ {
+ dcs_cmd->dcs_cmd.delay = value;
+ }
+
+ list_add_tail(&dcs_cmd->list, &dsi->cmdlist_head);
+ }
+ }
+ ret = of_property_read_u32(root, "rockchip,cmd_debug", &debug);
+ if(ret)
+ {
+ printk("%s: Can not read property: rockchip,cmd_debug.\n", __func__);
+ }
+ else
+ {
+ if (debug) {
+ list_for_each(pos, &dsi->cmdlist_head) {
+ dcs_cmd = list_entry(pos, struct mipi_dcs_cmd_ctr_list, list);
+ printk("dcs_name:%s," "dcs_type:%d," "delay:%d\n\n",
+ dcs_cmd->dcs_cmd.name,
+ dcs_cmd->dcs_cmd.type,
+ dcs_cmd->dcs_cmd.delay);
+ }
+ }
+ else
+ {
+ printk("---close cmd debug---\n");
+ }
+ }
+
+ ret=-1;
+ return ret;
+
}
+#endif
static int rk616_mipi_dsi_probe(struct platform_device *pdev)
{
@@ -1653,18 +1877,25 @@ static int rk616_mipi_dsi_probe(struct platform_device *pdev)
struct rk_screen *screen;
struct mipi_dsi_screen *dsi_screen;
static int id = 0;
+
#if defined(CONFIG_ARCH_RK319X) || defined(CONFIG_ARCH_RK3288)
struct resource *res_host, *res_phy, *res_irq;
#endif
#if defined(CONFIG_MFD_RK616)
struct mfd_rk616 *rk616;
#endif
-
dsi = devm_kzalloc(&pdev->dev, sizeof(struct dsi), GFP_KERNEL);
if(!dsi) {
dev_err(&pdev->dev,"request struct dsi fail!\n");
return -ENOMEM;
}
+ //printk("rk616_mipi_dsi_probe----------------------\n");
+
+ ret = mipi_dsi_get_screen_dt(&pdev->dev, dsi);
+ if (ret < 0) {
+ dev_err(&pdev->dev,"No platform data specified!\n");
+ return ret;
+ }
#if defined(CONFIG_MFD_RK616)
rk616 = dev_get_drvdata(pdev->dev.parent);
@@ -1755,7 +1986,7 @@ static int rk616_mipi_dsi_probe(struct platform_device *pdev)
clk_enable(clk_get(NULL, "pclk_mipiphy_dsi"));
#elif defined(CONFIG_ARCH_RK3288)
- res_host = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ /*res_host = platform_get_resource(pdev, IORESOURCE_MEM, 0);
dsi->host.membase = devm_request_and_ioremap(&pdev->dev, res_host);
if (!dsi->host.membase)
return -ENOMEM;
@@ -1771,7 +2002,7 @@ static int rk616_mipi_dsi_probe(struct platform_device *pdev)
ret = -EINVAL;
goto probe_err1;
}
- disable_irq(dsi->host.irq);
+ disable_irq(dsi->host.irq);*/
#endif /* CONFIG_MFD_RK616 */
@@ -1788,6 +2019,8 @@ static int rk616_mipi_dsi_probe(struct platform_device *pdev)
g_rk29fd_screen = screen;
#endif
+
+
dsi->pdev = pdev;
ops = &dsi->ops;
ops->dsi = dsi;
@@ -1825,8 +2058,20 @@ static int rk616_mipi_dsi_probe(struct platform_device *pdev)
dsi_screen->dsi_lane = screen->dsi_lane;
dsi_screen->dsi_video_mode = screen->dsi_video_mode;
dsi_screen->hs_tx_clk = screen->hs_tx_clk;
+
+ #if defined(CONFIG_ARCH_RK3288)
+
+ #else
dsi_screen->init = screen->init;
dsi_screen->standby = screen->standby;
+ #endif //end CONFIG_ARCH_RK3288
+
+ printk("dsi_screen->type=%d\n",dsi_screen->type);
+ printk("dsi_screen->pixclock=%d\n",dsi_screen->pixclock);
+ printk("dsi_screen->x_res=%d\n",dsi_screen->x_res);
+ printk("dsi_screen->y_res=%d\n",dsi_screen->y_res);
+
+
dsi->dsi_id = id++;//of_alias_get_id(pdev->dev.of_node, "dsi");
sprintf(ops->name, "rk_mipi_dsi.%d", dsi->dsi_id);
platform_set_drvdata(pdev, dsi);
@@ -1910,7 +2155,9 @@ static void rk616_mipi_dsi_shutdown(struct platform_device *pdev)
{
u8 dcs[4] = {0};
struct dsi *dsi = platform_get_drvdata(pdev);
-
+
+#if !defined(CONFIG_ARCH_RK3288)
+
if(!dsi->screen.standby) {
rk_mipi_dsi_enable_video_mode(dsi, 0);
dcs[0] = HSDT;
@@ -1924,7 +2171,9 @@ static void rk616_mipi_dsi_shutdown(struct platform_device *pdev)
} else {
dsi->screen.standby(1);
}
-
+
+#endif
+
rk_mipi_dsi_host_power_down(dsi);
rk_mipi_dsi_phy_power_down(dsi);
@@ -1934,9 +2183,9 @@ static void rk616_mipi_dsi_shutdown(struct platform_device *pdev)
#ifdef CONFIG_OF
static const struct of_device_id of_rk_mipi_dsi_match[] = {
- { .compatible = "rockchip,mipi_dsi" },
- { /* Sentinel */ }
-};
+ { .compatible = "rockchip,mipi_dsi" },
+ { /* Sentinel */ }
+};
#endif
static struct platform_driver rk616_mipi_dsi_driver = {
diff --git a/drivers/video/rockchip/transmitter/rk616_mipi_dsi.h b/drivers/video/rockchip/transmitter/rk616_mipi_dsi.h
old mode 100644
new mode 100755
index cf1296390569..078cb298a250
--- a/drivers/video/rockchip/transmitter/rk616_mipi_dsi.h
+++ b/drivers/video/rockchip/transmitter/rk616_mipi_dsi.h
@@ -396,6 +396,20 @@ struct dsi_host {
#endif
};
+
+struct dcs_cmd {
+ int type;
+ int cmds[32];
+ int delay;
+ char name[32];
+};
+
+struct mipi_dcs_cmd_ctr_list {
+ struct list_head list;
+ struct dcs_cmd dcs_cmd;
+};
+
+
struct dsi {
u8 dsi_id;
u8 lcdc_id;
@@ -412,6 +426,7 @@ struct dsi {
#endif
#endif
struct platform_device *pdev;
+ struct list_head cmdlist_head;
};
--
2.34.1