On Fri, 2010-03-12 at 16:27 +0100, Quadros Roger (Nokia-D/Helsinki)
wrote:
> From: Roger Quadros <roger.quad...@nokia.com>
>
> This patch enables the use of vdds_sdi regulator in SDI subsystem.
> We can disable the vdds_sdi voltage when not in use to save
> power.
>
> Signed-off-by: Roger Quadros <roger.quad...@nokia.com>
> ---
> drivers/video/omap2/dss/sdi.c | 23 +++++++++++++++++++++--
> 1 files changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
> index 45aab89..e816e80 100644
> --- a/drivers/video/omap2/dss/sdi.c
> +++ b/drivers/video/omap2/dss/sdi.c
> @@ -23,13 +23,16 @@
> #include <linux/clk.h>
> #include <linux/delay.h>
> #include <linux/err.h>
> +#include <linux/regulator/consumer.h>
>
> #include <plat/display.h>
> +#include <plat/cpu.h>
> #include "dss.h"
>
> static struct {
> bool skip_init;
> bool update_enabled;
> + struct regulator *vdds_sdi_reg;
> } sdi;
>
> static void sdi_basic_init(void)
> @@ -57,6 +60,12 @@ int omapdss_sdi_display_enable(struct omap_dss_device
> *dssdev)
> goto err0;
> }
>
> + if (cpu_is_omap34xx()) {
> + r = regulator_enable(sdi.vdds_sdi_reg);
> + if (r)
> + goto err1;
> + }
> +
> /* In case of skip_init sdi_init has already enabled the clocks */
> if (!sdi.skip_init)
> dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
> @@ -118,10 +127,10 @@ int omapdss_sdi_display_enable(struct omap_dss_device
> *dssdev)
> sdi.skip_init = 0;
>
> return 0;
> -err3:
> - dssdev->manager->disable(dssdev->manager);
> err2:
> dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
> + if (cpu_is_omap34xx())
> + regulator_enable(sdi.vdds_sdi_reg);
> err1:
> omap_dss_stop_device(dssdev);
> err0:
> @@ -137,6 +146,9 @@ void omapdss_sdi_display_disable(struct omap_dss_device
> *dssdev)
>
> dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
>
> + if (cpu_is_omap34xx())
> + regulator_enable(sdi.vdds_sdi_reg);
> +
> omap_dss_stop_device(dssdev);
> }
> EXPORT_SYMBOL(omapdss_sdi_display_disable);
> @@ -144,6 +156,13 @@ EXPORT_SYMBOL(omapdss_sdi_display_disable);
> int sdi_init_display(struct omap_dss_device *dssdev)
> {
> DSSDBG("SDI init\n");
> + if (cpu_is_omap34xx()) {
> + sdi.vdds_sdi_reg = dss_get_vdds_sdi();
> + if (IS_ERR(sdi.vdds_sdi_reg)) {
> + DSSERR("can't get VDDS_SDI regulator\n");
> + return PTR_ERR(sdi.vdds_sdi_reg);
> + }
> + }
>
> return 0;
> }
Same comment here as to DPI patch, I think the regulator init should be
done in sdi_init().
And why do you test for omap34xx?
Tomi
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
