[PATCH 0/2] omap: rx51: Fix broken fb on RX51/N900

Hi

Commit 60d24ee "Added video data to support tvout on rx51" broke the
framebuffer on N900. Here are two patches where 1st one does a little cleanup
to be sync with the 2nd fixing the issue. I've tested that both tvout and lcd
are working.

-- 
Jarkko

It is much more cleaner to use REGULATOR_SUPPLY macro and a device name
instead of having a reference to rx51_display_device.dev with #if defined()
guards.

Signed-off-by: Jarkko Nikula <redacted>
---
 arch/arm/mach-omap2/board-rx51-peripherals.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index fd95ccf..768f0dc 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c

@@ -359,17 +359,8 @@ static struct regulator_consumer_supply rx51_vio_supplies[] = {
 	REGULATOR_SUPPLY("DVDD", "2-0019"),
 };
 
-#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
-extern struct platform_device rx51_display_device;
-#endif
-
 static struct regulator_consumer_supply rx51_vaux1_consumers[] = {
-#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
-	{
-		.supply	= "vdds_sdi",
-		.dev	= &rx51_display_device.dev,
-	},
-#endif
+	REGULATOR_SUPPLY("vdds_sdi", "omapdss"),
 };
 
 static struct regulator_init_data rx51_vaux1 = {

-- 
1.7.2.3

Commmit 60d24ee "Added video data to support tvout on rx51" broke the DSS
on RX51/N900 since it added DSS VENC support but a patch adding needed
supply is missing from tree and no framebuffers are initialized.

This patch is basically cleaned up version of original one:
http://marc.info/?l=linux-omap&m=129070041402418&w=2

Signed-off-by: Jarkko Nikula <redacted>
Cc: Srikar <redacted>
Cc: Mark Brown <redacted>
---
Mark cc'edd since he had comments to the original patch what this patch is
trying to address.
---
 arch/arm/mach-omap2/board-rx51-peripherals.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 768f0dc..e75e240 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c

@@ -363,6 +363,10 @@ static struct regulator_consumer_supply rx51_vaux1_consumers[] = {
 	REGULATOR_SUPPLY("vdds_sdi", "omapdss"),
 };
 
+static struct regulator_consumer_supply rx51_vdac_supply[] = {
+	REGULATOR_SUPPLY("vdda_dac", "omapdss"),
+};
+
 static struct regulator_init_data rx51_vaux1 = {
 	.constraints = {
 		.name			= "V28",

@@ -480,14 +484,17 @@ static struct regulator_init_data rx51_vsim = {
 
 static struct regulator_init_data rx51_vdac = {
 	.constraints = {
+		.name			= "VDAC",
 		.min_uV			= 1800000,
 		.max_uV			= 1800000,
+		.apply_uV		= true,
 		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 					| REGULATOR_MODE_STANDBY,
-		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE
-					| REGULATOR_CHANGE_MODE
+		.valid_ops_mask		= REGULATOR_CHANGE_MODE
 					| REGULATOR_CHANGE_STATUS,
 	},
+	.num_consumer_supplies	= 1,
+	.consumer_supplies	= rx51_vdac_supply,
 };
 
 static struct regulator_init_data rx51_vio = {

-- 
1.7.2.3

* Jarkko Nikula [off-list ref] [101221 09:25]:

Hi

Commit 60d24ee "Added video data to support tvout on rx51" broke the
framebuffer on N900. Here are two patches where 1st one does a little cleanup
to be sync with the 2nd fixing the issue. I've tested that both tvout and lcd
are working.

Tomi, do you want to pick these three DSS/video related patches from Jarkko?

If so:

Acked-by: Tony Lindgren <tony@atomide.com>

else please ack and let me know if you want me to take them.

Regards,

Tony

On Tue, 21 Dec 2010 12:21:33 -0800
Tony Lindgren [off-list ref] wrote:

* Jarkko Nikula [off-list ref] [101221 09:25]:

quoted

Hi

Commit 60d24ee "Added video data to support tvout on rx51" broke the
framebuffer on N900. Here are two patches where 1st one does a little cleanup
to be sync with the 2nd fixing the issue. I've tested that both tvout and lcd
are working.

Tomi, do you want to pick these three DSS/video related patches from Jarkko?

If so:

Acked-by: Tony Lindgren <tony@atomide.com>

else please ack and let me know if you want me to take them.

I think these should go to linux-omap since the breakage is there and
anyway touch only the rx51 board files.

-- 
Jarkko

On Wed, 2010-12-22 at 08:56 +0200, ext Jarkko Nikula wrote:

On Tue, 21 Dec 2010 12:21:33 -0800
Tony Lindgren [off-list ref] wrote:

quoted

* Jarkko Nikula [off-list ref] [101221 09:25]:

quoted

Hi

Commit 60d24ee "Added video data to support tvout on rx51" broke the
framebuffer on N900. Here are two patches where 1st one does a little cleanup
to be sync with the 2nd fixing the issue. I've tested that both tvout and lcd
are working.

Tomi, do you want to pick these three DSS/video related patches from Jarkko?

If so:

Acked-by: Tony Lindgren <tony@atomide.com>

else please ack and let me know if you want me to take them.

I think these should go to linux-omap since the breakage is there and
anyway touch only the rx51 board files.

I agree, I don't have that commit in my tree. So Tony, please take the
patches.

For both patches:

Acked-by: Tomi Valkeinen <redacted>

 Tomi

* Tomi Valkeinen [off-list ref] [101222 01:45]:

On Wed, 2010-12-22 at 08:56 +0200, ext Jarkko Nikula wrote:

quoted

On Tue, 21 Dec 2010 12:21:33 -0800
Tony Lindgren [off-list ref] wrote:

quoted

* Jarkko Nikula [off-list ref] [101221 09:25]:

quoted

Hi

Commit 60d24ee "Added video data to support tvout on rx51" broke the
framebuffer on N900. Here are two patches where 1st one does a little cleanup
to be sync with the 2nd fixing the issue. I've tested that both tvout and lcd
are working.

Tomi, do you want to pick these three DSS/video related patches from Jarkko?

If so:

Acked-by: Tony Lindgren <tony@atomide.com>

else please ack and let me know if you want me to take them.

I think these should go to linux-omap since the breakage is there and
anyway touch only the rx51 board files.

I agree, I don't have that commit in my tree. So Tony, please take the
patches.

For both patches:

Acked-by: Tomi Valkeinen <redacted>

OK, thanks will queue.

Tony