Skip to contentSkip to conversation

omap: rx51: Fix broken fb on RX51/N900

PATCH New Jarkko Nikula 3 participants 7 messages Dec 21, 2010 – Dec 22, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover 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.

Signature · 1 line
Jarkko
#1 lore raw

PATCH 1/2 omap: rx51: Cleanup vdds_sdi supply construction

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.

---
 arch/arm/mach-omap2/board-rx51-peripherals.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)
arch/arm/mach-omap2/board-rx51-peripherals.c +1 -10
index fd95ccf..768f0dc 100644
@@ -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 = {
Signature · 1 line
1.7.2.3
#2 lore raw

PATCH 2/2 omap: rx51: Add vdda_dac supply for tvout

In reply to Jarkko Nikula

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

---
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(-)
arch/arm/mach-omap2/board-rx51-peripherals.c +9 -2
index 768f0dc..e75e240 100644
@@ -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 = {
Signature · 1 line
1.7.2.3
maintainer
#3 lore raw

cover omap: rx51: Fix broken fb on RX51/N900

In reply to Jarkko Nikula
Quoted 6 lines · Jarkko Nikula

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:

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

Regards,

Tony

#4 lore raw

cover omap: rx51: Fix broken fb on RX51/N900

Quoted 8 lines · On Tue, 21 Dec 2010 12:21:33 -0800 Tony Lindgren <[email protected]> wrote:
Quoted 6 lines · Jarkko Nikula

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.

Quoted 8 lines

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

If so:

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.

Signature · 1 line
Jarkko
#5 lore raw

cover omap: rx51: Fix broken fb on RX51/N900

Quoted 13 lines · ext Jarkko Nikula
Quoted 10 lines · On Tue, 21 Dec 2010 12:21:33 -0800 Tony Lindgren <[email protected]> wrote:
Quoted 6 lines · Jarkko Nikula

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?

Quoted 8 lines
Quoted 6 lines

If so:

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:

Tomi

maintainer
#6 lore raw

cover omap: rx51: Fix broken fb on RX51/N900

Quoted 23 lines · Tomi Valkeinen
Quoted 13 lines · ext Jarkko Nikula
Quoted 10 lines · On Tue, 21 Dec 2010 12:21:33 -0800 Tony Lindgren <[email protected]> wrote:
Quoted 6 lines · Jarkko Nikula

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?

Quoted 8 lines
Quoted 6 lines

If so:

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.

Quoted 6 lines

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

For both patches:

OK, thanks will queue.

Tony