Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 4 additions & 25 deletions drivers/video/msm/mipi_samsung.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,8 @@ static struct dsi_cmd_desc pico_samsung_cmd_on_cmds[] = {
sizeof(pio_c0), pio_c0},
{DTYPE_DCS_WRITE, 1, 0, 0, 120,
sizeof(exit_sleep), exit_sleep},
{DTYPE_DCS_WRITE1, 1, 0, 0, 0,
sizeof(bkl_enable_cmds), bkl_enable_cmds},
{DTYPE_DCS_WRITE, 1, 0, 0, 0,
sizeof(display_on), display_on},
};
Expand Down Expand Up @@ -356,6 +358,8 @@ static struct dsi_cmd_desc pico_samsung_C2_cmd_on_cmds[] = {
sizeof(enable_te), enable_te},
{DTYPE_DCS_WRITE, 1, 0, 0, 120,
sizeof(exit_sleep), exit_sleep},
{DTYPE_DCS_WRITE1, 1, 0, 0, 0,
sizeof(bkl_enable_cmds), bkl_enable_cmds},
{DTYPE_DCS_WRITE, 1, 0, 0, 0,
sizeof(display_on), display_on},
};
Expand Down Expand Up @@ -401,16 +405,6 @@ static struct dsi_cmd_desc samsung_display_on_cmds[] = {
sizeof(display_on), display_on},
};

static struct dsi_cmd_desc samsung_bkl_enable_cmds[] = {
{DTYPE_DCS_WRITE1, 1, 0, 0, 0,
sizeof(bkl_enable_cmds), bkl_enable_cmds},
};

static struct dsi_cmd_desc samsung_bkl_disable_cmds[] = {
{DTYPE_DCS_WRITE1, 1, 0, 0, 0,
sizeof(bkl_disable_cmds), bkl_disable_cmds},
};

void mipi_samsung_panel_type_detect(struct mipi_panel_info *mipi)
{
if (panel_type == PANEL_ID_PIO_SAMSUNG) {
Expand Down Expand Up @@ -444,18 +438,6 @@ void mipi_samsung_panel_type_detect(struct mipi_panel_info *mipi)
return;
}

static void mipi_samsung_bkl_ctrl(struct msm_fb_data_type *mfd, bool on)
{
PR_DISP_INFO("mipi_samsung_bkl_ctrl > on = %x\n", on);
if (on) {
mipi_dsi_cmds_tx2(mfd, &samsung_tx_buf, samsung_bkl_enable_cmds,
ARRAY_SIZE(samsung_bkl_enable_cmds));
} else {
mipi_dsi_cmds_tx2(mfd, &samsung_tx_buf, samsung_bkl_disable_cmds,
ARRAY_SIZE(samsung_bkl_disable_cmds));
}
}

static int mipi_samsung_lcd_on(struct platform_device *pdev)
{
struct msm_fb_data_type *mfd;
Expand Down Expand Up @@ -486,9 +468,6 @@ static int mipi_samsung_lcd_on(struct platform_device *pdev)
mipi_dsi_cmds_tx2(mfd, &samsung_tx_buf, mipi_power_on_cmd,
mipi_power_on_cmd_size);

hr_msleep(40);
mipi_samsung_bkl_ctrl(mfd, true);

} else {
printk(KERN_ERR "panel_type=0x%x not support at power on\n", panel_type);
return -EINVAL;
Expand Down