[PATCHv2 0/3] OMAP: DSS2: Allow us to use SDI

[PATCHv2 0/3] OMAP: DSS2: Allow us to use SDI

[Roger Quadros]

SDI now makes use of vdds_sdi regulator supply.
DPI can now be disabled on systems that don't have it

changes since v1:
- Incorporated review comments
- no more omap3xx checks for regulator enable/disable in SDI
- Added Kconfig option to enable/disable DPI

Roger Quadros (3):
  OMAP: DSS2: Add Kconfig option for DPI display type
  OMAP: DSS2: Remove redundant enable/disable calls from SDI
  OMAP: DSS2: Use vdds_sdi regulator supply in SDI

 drivers/video/omap2/dss/Kconfig   |    6 ++++++
 drivers/video/omap2/dss/Makefile  |    3 ++-
 drivers/video/omap2/dss/core.c    |    4 ++++
 drivers/video/omap2/dss/display.c |    4 ++++
 drivers/video/omap2/dss/sdi.c     |   26 +++++++++++++++-----------
 5 files changed, 31 insertions(+), 12 deletions(-)

[PATCHv2 1/3] OMAP: DSS2: Add Kconfig option for DPI display type

[Roger Quadros]

From: Roger Quadros <roger.quadros@nokia.com>

This allows us to disable DPI on systems that do not have it

Signed-off-by: Roger Quadros <roger.quadros@nokia.com>
---
 drivers/video/omap2/dss/Kconfig   |    6 ++++++
 drivers/video/omap2/dss/Makefile  |    3 ++-
 drivers/video/omap2/dss/core.c    |    4 ++++
 drivers/video/omap2/dss/display.c |    4 ++++
 4 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig
index 87afb81..7cc2bda 100644
--- a/drivers/video/omap2/dss/Kconfig
+++ b/drivers/video/omap2/dss/Kconfig
@@ -36,6 +36,12 @@ config OMAP2_DSS_COLLECT_IRQ_STATS
 	  <debugfs>/omapdss/dispc_irq for DISPC interrupts, and
 	  <debugfs>/omapdss/dsi_irq for DSI interrupts.
 
+config OMAP2_DSS_DPI
+	bool "DPI support"
+	default y
+	help
+	  DPI Interface. This is the Parallel Display Interface.
+
 config OMAP2_DSS_RFBI
 	bool "RFBI support"
         default n
diff --git a/drivers/video/omap2/dss/Makefile b/drivers/video/omap2/dss/Makefile
index 980c72c..d71b5d9 100644
--- a/drivers/video/omap2/dss/Makefile
+++ b/drivers/video/omap2/dss/Makefile
@@ -1,5 +1,6 @@
 obj-$(CONFIG_OMAP2_DSS) += omapdss.o
-omapdss-y := core.o dss.o dispc.o dpi.o display.o manager.o overlay.o
+omapdss-y := core.o dss.o dispc.o display.o manager.o overlay.o
+omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o
 omapdss-$(CONFIG_OMAP2_DSS_RFBI) += rfbi.o
 omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o
 omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index 7ebe50b..6d54467 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -526,11 +526,13 @@ static int omap_dss_probe(struct platform_device *pdev)
 	}
 #endif
 
+#ifdef CONFIG_OMAP2_DSS_DPI
 	r = dpi_init(pdev);
 	if (r) {
 		DSSERR("Failed to initialize dpi\n");
 		goto fail0;
 	}
+#endif
 
 	r = dispc_init();
 	if (r) {
@@ -601,7 +603,9 @@ static int omap_dss_remove(struct platform_device *pdev)
 	venc_exit();
 #endif
 	dispc_exit();
+#ifdef CONFIG_OMAP2_DSS_DPI
 	dpi_exit();
+#endif
 #ifdef CONFIG_OMAP2_DSS_RFBI
 	rfbi_exit();
 #endif
diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
index 6a74ea1..7138963 100644
--- a/drivers/video/omap2/dss/display.c
+++ b/drivers/video/omap2/dss/display.c
@@ -392,7 +392,9 @@ void dss_init_device(struct platform_device *pdev,
 	int r;
 
 	switch (dssdev->type) {
+#ifdef CONFIG_OMAP2_DSS_DPI
 	case OMAP_DISPLAY_TYPE_DPI:
+#endif
 #ifdef CONFIG_OMAP2_DSS_RFBI
 	case OMAP_DISPLAY_TYPE_DBI:
 #endif
@@ -413,9 +415,11 @@ void dss_init_device(struct platform_device *pdev,
 	}
 
 	switch (dssdev->type) {
+#ifdef CONFIG_OMAP2_DSS_DPI
 	case OMAP_DISPLAY_TYPE_DPI:
 		r = dpi_init_display(dssdev);
 		break;
+#endif
 #ifdef CONFIG_OMAP2_DSS_RFBI
 	case OMAP_DISPLAY_TYPE_DBI:
 		r = rfbi_init_display(dssdev);
-- 
1.6.3.3

[PATCHv2 2/3] OMAP: DSS2: Remove redundant enable/disable calls from SDI

[Roger Quadros]

From: Roger Quadros <roger.quadros@nokia.com>

Panel enable/disable is now done via the panel driver, so we should not
call the panel driver again

Signed-off-by: Roger Quadros <roger.quadros@nokia.com>
---
 drivers/video/omap2/dss/sdi.c |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index 12eb404..3de3c1e 100644
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -115,17 +115,9 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
 
 	dssdev->manager->enable(dssdev->manager);
 
-	if (dssdev->driver->enable) {
-		r = dssdev->driver->enable(dssdev);
-		if (r)
-			goto err3;
-	}
-
 	sdi.skip_init = 0;
 
 	return 0;
-err3:
-	dssdev->manager->disable(dssdev->manager);
 err2:
 	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
 err1:
@@ -137,9 +129,6 @@ EXPORT_SYMBOL(omapdss_sdi_display_enable);
 
 void omapdss_sdi_display_disable(struct omap_dss_device *dssdev)
 {
-	if (dssdev->driver->disable)
-		dssdev->driver->disable(dssdev);
-
 	dssdev->manager->disable(dssdev->manager);
 
 	dss_sdi_disable();
-- 
1.6.3.3

[PATCHv2 3/3] OMAP: DSS2: Use vdds_sdi regulator supply in SDI

[Roger Quadros]

From: Roger Quadros <roger.quadros@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.quadros@nokia.com>
---
 drivers/video/omap2/dss/sdi.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index 3de3c1e..ee07a3c 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,10 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
 		goto err0;
 	}
 
+	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);
@@ -120,6 +127,7 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
 	return 0;
 err2:
 	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+	regulator_disable(sdi.vdds_sdi_reg);
 err1:
 	omap_dss_stop_device(dssdev);
 err0:
@@ -135,6 +143,8 @@ void omapdss_sdi_display_disable(struct omap_dss_device *dssdev)
 
 	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
 
+	regulator_disable(sdi.vdds_sdi_reg);
+
 	omap_dss_stop_device(dssdev);
 }
 EXPORT_SYMBOL(omapdss_sdi_display_disable);
@@ -151,6 +161,11 @@ int sdi_init(bool skip_init)
 	/* we store this for first display enable, then clear it */
 	sdi.skip_init = skip_init;
 
+	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);
+	}
 	/*
 	 * Enable clocks already here, otherwise there would be a toggle
 	 * of them until sdi_display_enable is called.
-- 
1.6.3.3

Re: [PATCHv2 0/3] OMAP: DSS2: Allow us to use SDI

[Tomi Valkeinen]

Hi,

On Wed, 2010-03-17 at 13:35 +0100, Quadros Roger (Nokia-D/Helsinki)
wrote:
> SDI now makes use of vdds_sdi regulator supply.
> DPI can now be disabled on systems that don't have it
> 
> changes since v1:
> - Incorporated review comments
> - no more omap3xx checks for regulator enable/disable in SDI
> - Added Kconfig option to enable/disable DPI
> 
> Roger Quadros (3):
>   OMAP: DSS2: Add Kconfig option for DPI display type
>   OMAP: DSS2: Remove redundant enable/disable calls from SDI
>   OMAP: DSS2: Use vdds_sdi regulator supply in SDI

I think this patch set looks ok. Thanks!

 Tomi

Ps. I took the liberty of removing an extra #include <plat/cpu.h>

Re: [PATCHv2 0/3] OMAP: DSS2: Allow us to use SDI

[Roger Quadros]

Hi,

Valkeinen Tomi (Nokia-D/Helsinki) wrote:
> Hi,
> 
> On Wed, 2010-03-17 at 13:35 +0100, Quadros Roger (Nokia-D/Helsinki)
> wrote:
>> SDI now makes use of vdds_sdi regulator supply.
>> DPI can now be disabled on systems that don't have it
>>
>> changes since v1:
>> - Incorporated review comments
>> - no more omap3xx checks for regulator enable/disable in SDI
>> - Added Kconfig option to enable/disable DPI
>>
>> Roger Quadros (3):
>>   OMAP: DSS2: Add Kconfig option for DPI display type
>>   OMAP: DSS2: Remove redundant enable/disable calls from SDI
>>   OMAP: DSS2: Use vdds_sdi regulator supply in SDI
> 
> I think this patch set looks ok. Thanks!
> 
>  Tomi
> 
> Ps. I took the liberty of removing an extra #include <plat/cpu.h>

Thanks, I had overlooked it.

-roger

Re: [PATCHv2 0/3] OMAP: DSS2: Allow us to use SDI

[Roger Quadros]

Hi,

Valkeinen Tomi (Nokia-D/Helsinki) wrote:
> Hi,
> 
> On Wed, 2010-03-17 at 13:35 +0100, Quadros Roger (Nokia-D/Helsinki)
> wrote:
>> SDI now makes use of vdds_sdi regulator supply.
>> DPI can now be disabled on systems that don't have it
>>
>> changes since v1:
>> - Incorporated review comments
>> - no more omap3xx checks for regulator enable/disable in SDI
>> - Added Kconfig option to enable/disable DPI
>>
>> Roger Quadros (3):
>>   OMAP: DSS2: Add Kconfig option for DPI display type
>>   OMAP: DSS2: Remove redundant enable/disable calls from SDI
>>   OMAP: DSS2: Use vdds_sdi regulator supply in SDI
> 
> I think this patch set looks ok. Thanks!
> 
>  Tomi
> 
> Ps. I took the liberty of removing an extra #include <plat/cpu.h>
> 
> 
Are these patches applied somewhere already. I need to send more patches that 
get N900 panel working for which I need these patches applied.

cheers,
-roger

Re: [PATCHv2 0/3] OMAP: DSS2: Allow us to use SDI

[Roger Quadros]

hi Tomi,

Valkeinen Tomi (Nokia-D/Helsinki) wrote:
> Hi,
> 
> On Wed, 2010-03-17 at 13:35 +0100, Quadros Roger (Nokia-D/Helsinki)
> wrote:
>> SDI now makes use of vdds_sdi regulator supply.
>> DPI can now be disabled on systems that don't have it
>>
>> changes since v1:
>> - Incorporated review comments
>> - no more omap3xx checks for regulator enable/disable in SDI
>> - Added Kconfig option to enable/disable DPI
>>
>> Roger Quadros (3):
>>   OMAP: DSS2: Add Kconfig option for DPI display type
>>   OMAP: DSS2: Remove redundant enable/disable calls from SDI
>>   OMAP: DSS2: Use vdds_sdi regulator supply in SDI
> 
> I think this patch set looks ok. Thanks!
> 
>  Tomi
> 
> Ps. I took the liberty of removing an extra #include <plat/cpu.h>
> 
> 
What is the status of this patch set?
Is it supposed to go into your tree or Tony's tree?

cheers
-roger

Re: [PATCHv2 0/3] OMAP: DSS2: Allow us to use SDI

[Tomi Valkeinen]

Hi,

On Tue, 2010-04-06 at 18:03 +0200, Quadros Roger (Nokia-D/Helsinki)
wrote:
> hi Tomi,
> 
> Valkeinen Tomi (Nokia-D/Helsinki) wrote:
> > Hi,
> > 
> > On Wed, 2010-03-17 at 13:35 +0100, Quadros Roger (Nokia-D/Helsinki)
> > wrote:
> >> SDI now makes use of vdds_sdi regulator supply.
> >> DPI can now be disabled on systems that don't have it
> >>
> >> changes since v1:
> >> - Incorporated review comments
> >> - no more omap3xx checks for regulator enable/disable in SDI
> >> - Added Kconfig option to enable/disable DPI
> >>
> >> Roger Quadros (3):
> >>   OMAP: DSS2: Add Kconfig option for DPI display type
> >>   OMAP: DSS2: Remove redundant enable/disable calls from SDI
> >>   OMAP: DSS2: Use vdds_sdi regulator supply in SDI
> > 
> > I think this patch set looks ok. Thanks!
> > 
> >  Tomi
> > 
> > Ps. I took the liberty of removing an extra #include <plat/cpu.h>
> > 
> > 
> What is the status of this patch set?
> Is it supposed to go into your tree or Tony's tree?

I applied the patches to my tree yesterday. Sorry it took so long.

 Tomi