Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 310286
b: refs/heads/master
c: b89e139
h: refs/heads/master
v: v3
  • Loading branch information
Sylwester Nawrocki authored and Florian Tobias Schandinat committed May 13, 2012
1 parent 233f3b7 commit c7ffeab
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3bfc9b835a8729f8a44de56930c1652293cfbf57
refs/heads/master: b89e1399bab8bf72762948d251e69df50a9d6d85
26 changes: 14 additions & 12 deletions trunk/drivers/video/exynos/exynos_mipi_dsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -415,27 +415,30 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
goto err_platform_get_irq;
}

init_completion(&dsim_wr_comp);
init_completion(&dsim_rd_comp);
platform_set_drvdata(pdev, dsim);

ret = request_irq(dsim->irq, exynos_mipi_dsi_interrupt_handler,
IRQF_SHARED, pdev->name, dsim);
IRQF_SHARED, dev_name(&pdev->dev), dsim);
if (ret != 0) {
dev_err(&pdev->dev, "failed to request dsim irq\n");
ret = -EINVAL;
goto err_bind;
}

init_completion(&dsim_wr_comp);
init_completion(&dsim_rd_comp);

/* enable interrupt */
/* enable interrupts */
exynos_mipi_dsi_init_interrupt(dsim);

/* initialize mipi-dsi client(lcd panel). */
if (dsim_ddi->dsim_lcd_drv && dsim_ddi->dsim_lcd_drv->probe)
dsim_ddi->dsim_lcd_drv->probe(dsim_ddi->dsim_lcd_dev);

/* in case that mipi got enabled at bootloader. */
if (dsim_pd->enabled)
goto out;
/* in case mipi-dsi has been enabled by bootloader */
if (dsim_pd->enabled) {
exynos_mipi_regulator_enable(dsim);
goto done;
}

/* lcd panel power on. */
if (dsim_ddi->dsim_lcd_drv && dsim_ddi->dsim_lcd_drv->power_on)
Expand All @@ -455,12 +458,11 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)

dsim->suspended = false;

out:
done:
platform_set_drvdata(pdev, dsim);

dev_dbg(&pdev->dev, "mipi-dsi driver(%s mode) has been probed.\n",
(dsim_config->e_interface == DSIM_COMMAND) ?
"CPU" : "RGB");
dev_dbg(&pdev->dev, "%s() completed sucessfuly (%s mode)\n", __func__,
dsim_config->e_interface == DSIM_COMMAND ? "CPU" : "RGB");

return 0;

Expand Down

0 comments on commit c7ffeab

Please sign in to comment.