Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 184844
b: refs/heads/master
c: 8a2cfea
h: refs/heads/master
v: v3
  • Loading branch information
Tomi Valkeinen committed Feb 12, 2010
1 parent 3fad390 commit 20f7bd5
Show file tree
Hide file tree
Showing 6 changed files with 118 additions and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e721032785b72afbc3da14c5525ca570bc2ed108
refs/heads/master: 8a2cfea8ccb6292dc43c37968fe08475ae7c2576
66 changes: 65 additions & 1 deletion trunk/drivers/video/omap2/dss/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <linux/debugfs.h>
#include <linux/io.h>
#include <linux/device.h>
#include <linux/regulator/consumer.h>

#include <plat/display.h>
#include <plat/clock.h>
Expand All @@ -47,6 +48,10 @@ static struct {
struct clk *dss_54m_fck;
struct clk *dss_96m_fck;
unsigned num_clks_enabled;

struct regulator *vdds_dsi_reg;
struct regulator *vdds_sdi_reg;
struct regulator *vdda_dac_reg;
} core;

static void dss_clk_enable_all_no_ctx(void);
Expand Down Expand Up @@ -352,6 +357,50 @@ static void dss_clk_disable_all(void)
dss_clk_disable(clks);
}

/* REGULATORS */

struct regulator *dss_get_vdds_dsi(void)
{
struct regulator *reg;

if (core.vdds_dsi_reg != NULL)
return core.vdds_dsi_reg;

reg = regulator_get(&core.pdev->dev, "vdds_dsi");
if (!IS_ERR(reg))
core.vdds_dsi_reg = reg;

return reg;
}

struct regulator *dss_get_vdds_sdi(void)
{
struct regulator *reg;

if (core.vdds_sdi_reg != NULL)
return core.vdds_sdi_reg;

reg = regulator_get(&core.pdev->dev, "vdds_sdi");
if (!IS_ERR(reg))
core.vdds_sdi_reg = reg;

return reg;
}

struct regulator *dss_get_vdda_dac(void)
{
struct regulator *reg;

if (core.vdda_dac_reg != NULL)
return core.vdda_dac_reg;

reg = regulator_get(&core.pdev->dev, "vdda_dac");
if (!IS_ERR(reg))
core.vdda_dac_reg = reg;

return reg;
}

/* DEBUGFS */
#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
static void dss_debug_dump_clocks(struct seq_file *s)
Expand Down Expand Up @@ -473,7 +522,7 @@ static int omap_dss_probe(struct platform_device *pdev)
}
#endif

r = dpi_init();
r = dpi_init(pdev);
if (r) {
DSSERR("Failed to initialize dpi\n");
goto fail0;
Expand Down Expand Up @@ -901,6 +950,21 @@ static int __init omap_dss_init(void)

static void __exit omap_dss_exit(void)
{
if (core.vdds_dsi_reg != NULL) {
regulator_put(core.vdds_dsi_reg);
core.vdds_dsi_reg = NULL;
}

if (core.vdds_sdi_reg != NULL) {
regulator_put(core.vdds_sdi_reg);
core.vdds_sdi_reg = NULL;
}

if (core.vdda_dac_reg != NULL) {
regulator_put(core.vdda_dac_reg);
core.vdda_dac_reg = NULL;
}

platform_driver_unregister(&omap_dss_driver);

omap_dss_bus_unregister();
Expand Down
55 changes: 46 additions & 9 deletions trunk/drivers/video/omap2/dss/dpi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@
#include <linux/kernel.h>
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/errno.h>
#include <linux/platform_device.h>
#include <linux/regulator/consumer.h>

#include <plat/display.h>
#include <plat/cpu.h>
Expand All @@ -34,6 +37,7 @@

static struct {
int update_enabled;
struct regulator *vdds_dsi_reg;
} dpi;

#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
Expand Down Expand Up @@ -166,44 +170,53 @@ static int dpi_display_enable(struct omap_dss_device *dssdev)
goto err1;
}

if (cpu_is_omap34xx()) {
r = regulator_enable(dpi.vdds_dsi_reg);
if (r)
goto err2;
}

dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);

r = dpi_basic_init(dssdev);
if (r)
goto err2;
goto err3;

#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
dss_clk_enable(DSS_CLK_FCK2);
r = dsi_pll_init(dssdev, 0, 1);
if (r)
goto err3;
goto err4;
#endif
r = dpi_set_mode(dssdev);
if (r)
goto err4;
goto err5;

mdelay(2);

dispc_enable_lcd_out(1);

r = dssdev->driver->enable(dssdev);
if (r)
goto err5;
goto err6;

dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;

return 0;

err5:
err6:
dispc_enable_lcd_out(0);
err4:
err5:
#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
dsi_pll_uninit();
err3:
err4:
dss_clk_disable(DSS_CLK_FCK2);
#endif
err2:
err3:
dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
err2:
if (cpu_is_omap34xx())
regulator_disable(dpi.vdds_dsi_reg);
err1:
omap_dss_stop_device(dssdev);
err0:
Expand Down Expand Up @@ -232,6 +245,9 @@ static void dpi_display_disable(struct omap_dss_device *dssdev)

dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);

if (cpu_is_omap34xx())
regulator_disable(dpi.vdds_dsi_reg);

dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

omap_dss_stop_device(dssdev);
Expand All @@ -251,18 +267,29 @@ static int dpi_display_suspend(struct omap_dss_device *dssdev)

dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);

if (cpu_is_omap34xx())
regulator_disable(dpi.vdds_dsi_reg);

dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;

return 0;
}

static int dpi_display_resume(struct omap_dss_device *dssdev)
{
int r;

if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED)
return -EINVAL;

DSSDBG("dpi_display_resume\n");

if (cpu_is_omap34xx()) {
r = regulator_enable(dpi.vdds_dsi_reg);
if (r)
goto err0;
}

dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);

dispc_enable_lcd_out(1);
Expand All @@ -273,6 +300,8 @@ static int dpi_display_resume(struct omap_dss_device *dssdev)
dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;

return 0;
err0:
return r;
}

static void dpi_set_timings(struct omap_dss_device *dssdev,
Expand Down Expand Up @@ -388,8 +417,16 @@ int dpi_init_display(struct omap_dss_device *dssdev)
return 0;
}

int dpi_init(void)
int dpi_init(struct platform_device *pdev)
{
if (cpu_is_omap34xx()) {
dpi.vdds_dsi_reg = dss_get_vdds_dsi();
if (IS_ERR(dpi.vdds_dsi_reg)) {
DSSERR("can't get VDDS_DSI regulator\n");
return PTR_ERR(dpi.vdds_dsi_reg);
}
}

return 0;
}

Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/video/omap2/dss/dsi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3799,7 +3799,7 @@ int dsi_init(struct platform_device *pdev)
goto err1;
}

dsi.vdds_dsi_reg = regulator_get(&pdev->dev, "vdds_dsi");
dsi.vdds_dsi_reg = dss_get_vdds_dsi();
if (IS_ERR(dsi.vdds_dsi_reg)) {
iounmap(dsi.base);
DSSERR("can't get VDDS_DSI regulator\n");
Expand Down Expand Up @@ -3830,8 +3830,6 @@ void dsi_exit(void)
{
kthread_stop(dsi.thread);

regulator_put(dsi.vdds_dsi_reg);

iounmap(dsi.base);

DSSDBG("omap_dsi_exit\n");
Expand Down
5 changes: 4 additions & 1 deletion trunk/drivers/video/omap2/dss/dss.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ unsigned long dss_clk_get_rate(enum dss_clock clk);
int dss_need_ctx_restore(void);
void dss_dump_clocks(struct seq_file *s);
struct bus_type *dss_get_bus(void);
struct regulator *dss_get_vdds_dsi(void);
struct regulator *dss_get_vdds_sdi(void);
struct regulator *dss_get_vdda_dac(void);

/* display */
int dss_suspend_all_devices(void);
Expand Down Expand Up @@ -261,7 +264,7 @@ void dsi_get_overlay_fifo_thresholds(enum omap_plane plane,
u32 *fifo_low, u32 *fifo_high);

/* DPI */
int dpi_init(void);
int dpi_init(struct platform_device *pdev);
void dpi_exit(void);
int dpi_init_display(struct omap_dss_device *dssdev);

Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/video/omap2/dss/venc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ int venc_init(struct platform_device *pdev)
return -ENOMEM;
}

venc.vdda_dac_reg = regulator_get(&pdev->dev, "vdda_dac");
venc.vdda_dac_reg = dss_get_vdda_dac();
if (IS_ERR(venc.vdda_dac_reg)) {
iounmap(venc.base);
DSSERR("can't get VDDA_DAC regulator\n");
Expand All @@ -503,8 +503,6 @@ void venc_exit(void)
{
omap_dss_unregister_driver(&venc_driver);

regulator_put(venc.vdda_dac_reg);

iounmap(venc.base);
}

Expand Down

0 comments on commit 20f7bd5

Please sign in to comment.