* [PATCH] Combine dsi and sdi under the same vdds supply.
@ 2010-07-15 20:15 Mathieu Poirier
2010-07-16 23:21 ` Paul Walmsley
0 siblings, 1 reply; 3+ messages in thread
From: Mathieu Poirier @ 2010-07-15 20:15 UTC (permalink / raw)
To: tony, paul; +Cc: linux-omap, Mathieu Poirier
>From b817304b25a0358f2897d39048adfada8d4126bc Mon Sep 17 00:00:00 2001
From: Mathieu J. Poirier <mathieu.poirier@canonical.com>
Date: Wed, 14 Jul 2010 15:31:46 -0600
Subject: [PATCH] Combine dsi and sdi under the same vdds supply.
The omapfb driver can't locate its display sink because of an
initialization error in the DSS subsystem. This error is caused by a
missing sdi entry in the board power regulator list. Adding the missing
sdi entry and combining dsi and sdi under the same vdds supply.
BugLink: https://bugs.launchpad.net/bugs/597904
Signed-off-by: <mathieu.poirier@canonical.com>
---
arch/arm/mach-omap2/board-omap3beagle.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 69b154c..32565dc 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -162,8 +162,10 @@ static struct platform_device beagle_dss_device = {
static struct regulator_consumer_supply beagle_vdac_supply =
REGULATOR_SUPPLY("vdda_dac", "omapdss");
-static struct regulator_consumer_supply beagle_vdvi_supply =
- REGULATOR_SUPPLY("vdds_dsi", "omapdss");
+static struct regulator_consumer_supply beagle_vdds_supplies[] = {
+ REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
+ REGULATOR_SUPPLY("vdds_sdi", "omapdss"),
+};
static void __init beagle_display_init(void)
{
@@ -291,7 +293,6 @@ static struct regulator_init_data beagle_vdac = {
/* VPLL2 for digital video outputs */
static struct regulator_init_data beagle_vpll2 = {
.constraints = {
- .name = "VDVI",
.min_uV = 1800000,
.max_uV = 1800000,
.valid_modes_mask = REGULATOR_MODE_NORMAL
@@ -299,8 +300,8 @@ static struct regulator_init_data beagle_vpll2 = {
.valid_ops_mask = REGULATOR_CHANGE_MODE
| REGULATOR_CHANGE_STATUS,
},
- .num_consumer_supplies = 1,
- .consumer_supplies = &beagle_vdvi_supply,
+ .num_consumer_supplies = ARRAY_SIZE(beagle_vdds_supplies),
+ .consumer_supplies = beagle_vdds_supplies,
};
static struct twl4030_usb_data beagle_usb_data = {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Combine dsi and sdi under the same vdds supply.
2010-07-15 20:15 [PATCH] Combine dsi and sdi under the same vdds supply Mathieu Poirier
@ 2010-07-16 23:21 ` Paul Walmsley
2010-07-17 6:18 ` Tomi.Valkeinen
0 siblings, 1 reply; 3+ messages in thread
From: Paul Walmsley @ 2010-07-16 23:21 UTC (permalink / raw)
To: Koen Kooi, Tomi Valkeinen; +Cc: Mathieu Poirier, tony, linux-omap
Tomi, Koen,
On Thu, 15 Jul 2010, Mathieu Poirier wrote:
> >From b817304b25a0358f2897d39048adfada8d4126bc Mon Sep 17 00:00:00 2001
> From: Mathieu J. Poirier <mathieu.poirier@canonical.com>
> Date: Wed, 14 Jul 2010 15:31:46 -0600
> Subject: [PATCH] Combine dsi and sdi under the same vdds supply.
>
> The omapfb driver can't locate its display sink because of an
> initialization error in the DSS subsystem. This error is caused by a
> missing sdi entry in the board power regulator list. Adding the missing
> sdi entry and combining dsi and sdi under the same vdds supply.
>
> BugLink: https://bugs.launchpad.net/bugs/597904
>
> Signed-off-by: <mathieu.poirier@canonical.com>
care to take a quick look at this one?
- Paul
> ---
> arch/arm/mach-omap2/board-omap3beagle.c | 11 ++++++-----
> 1 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
> index 69b154c..32565dc 100644
> --- a/arch/arm/mach-omap2/board-omap3beagle.c
> +++ b/arch/arm/mach-omap2/board-omap3beagle.c
> @@ -162,8 +162,10 @@ static struct platform_device beagle_dss_device = {
> static struct regulator_consumer_supply beagle_vdac_supply =
> REGULATOR_SUPPLY("vdda_dac", "omapdss");
>
> -static struct regulator_consumer_supply beagle_vdvi_supply =
> - REGULATOR_SUPPLY("vdds_dsi", "omapdss");
> +static struct regulator_consumer_supply beagle_vdds_supplies[] = {
> + REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
> + REGULATOR_SUPPLY("vdds_sdi", "omapdss"),
> +};
>
> static void __init beagle_display_init(void)
> {
> @@ -291,7 +293,6 @@ static struct regulator_init_data beagle_vdac = {
> /* VPLL2 for digital video outputs */
> static struct regulator_init_data beagle_vpll2 = {
> .constraints = {
> - .name = "VDVI",
> .min_uV = 1800000,
> .max_uV = 1800000,
> .valid_modes_mask = REGULATOR_MODE_NORMAL
> @@ -299,8 +300,8 @@ static struct regulator_init_data beagle_vpll2 = {
> .valid_ops_mask = REGULATOR_CHANGE_MODE
> | REGULATOR_CHANGE_STATUS,
> },
> - .num_consumer_supplies = 1,
> - .consumer_supplies = &beagle_vdvi_supply,
> + .num_consumer_supplies = ARRAY_SIZE(beagle_vdds_supplies),
> + .consumer_supplies = beagle_vdds_supplies,
> };
>
> static struct twl4030_usb_data beagle_usb_data = {
> --
> 1.7.0.4
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* RE: [PATCH] Combine dsi and sdi under the same vdds supply.
2010-07-16 23:21 ` Paul Walmsley
@ 2010-07-17 6:18 ` Tomi.Valkeinen
0 siblings, 0 replies; 3+ messages in thread
From: Tomi.Valkeinen @ 2010-07-17 6:18 UTC (permalink / raw)
To: paul, koen, mathieu.poirier; +Cc: tony, linux-omap
Hi,
Sorry for top posting, using MS outlook web access.
I don't think this patch is needed. SDI output requires vdds_sdi to work, but beagle board doesn't use SDI. I believe you have for some reason enabled SDI in kernel config. Disabling it should fix the boot problem.
The DSS driver should probably only try to get the regulator if SDI interface is actually being used, as the current way makes it impossible to use the same kernel for different boards...
Tomi
________________________________________
From: linux-omap-owner@vger.kernel.org [linux-omap-owner@vger.kernel.org] On Behalf Of ext Paul Walmsley [paul@pwsan.com]
Sent: Saturday, July 17, 2010 02:21
To: Koen Kooi; Valkeinen Tomi (Nokia-MS/Helsinki)
Cc: Mathieu Poirier; tony@atomide.com; linux-omap@vger.kernel.org
Subject: Re: [PATCH] Combine dsi and sdi under the same vdds supply.
Tomi, Koen,
On Thu, 15 Jul 2010, Mathieu Poirier wrote:
> >From b817304b25a0358f2897d39048adfada8d4126bc Mon Sep 17 00:00:00 2001
> From: Mathieu J. Poirier <mathieu.poirier@canonical.com>
> Date: Wed, 14 Jul 2010 15:31:46 -0600
> Subject: [PATCH] Combine dsi and sdi under the same vdds supply.
>
> The omapfb driver can't locate its display sink because of an
> initialization error in the DSS subsystem. This error is caused by a
> missing sdi entry in the board power regulator list. Adding the missing
> sdi entry and combining dsi and sdi under the same vdds supply.
>
> BugLink: https://bugs.launchpad.net/bugs/597904
>
> Signed-off-by: <mathieu.poirier@canonical.com>
care to take a quick look at this one?
- Paul
> ---
> arch/arm/mach-omap2/board-omap3beagle.c | 11 ++++++-----
> 1 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
> index 69b154c..32565dc 100644
> --- a/arch/arm/mach-omap2/board-omap3beagle.c
> +++ b/arch/arm/mach-omap2/board-omap3beagle.c
> @@ -162,8 +162,10 @@ static struct platform_device beagle_dss_device = {
> static struct regulator_consumer_supply beagle_vdac_supply =
> REGULATOR_SUPPLY("vdda_dac", "omapdss");
>
> -static struct regulator_consumer_supply beagle_vdvi_supply =
> - REGULATOR_SUPPLY("vdds_dsi", "omapdss");
> +static struct regulator_consumer_supply beagle_vdds_supplies[] = {
> + REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
> + REGULATOR_SUPPLY("vdds_sdi", "omapdss"),
> +};
>
> static void __init beagle_display_init(void)
> {
> @@ -291,7 +293,6 @@ static struct regulator_init_data beagle_vdac = {
> /* VPLL2 for digital video outputs */
> static struct regulator_init_data beagle_vpll2 = {
> .constraints = {
> - .name = "VDVI",
> .min_uV = 1800000,
> .max_uV = 1800000,
> .valid_modes_mask = REGULATOR_MODE_NORMAL
> @@ -299,8 +300,8 @@ static struct regulator_init_data beagle_vpll2 = {
> .valid_ops_mask = REGULATOR_CHANGE_MODE
> | REGULATOR_CHANGE_STATUS,
> },
> - .num_consumer_supplies = 1,
> - .consumer_supplies = &beagle_vdvi_supply,
> + .num_consumer_supplies = ARRAY_SIZE(beagle_vdds_supplies),
> + .consumer_supplies = beagle_vdds_supplies,
> };
>
> static struct twl4030_usb_data beagle_usb_data = {
> --
> 1.7.0.4
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-17 6:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-15 20:15 [PATCH] Combine dsi and sdi under the same vdds supply Mathieu Poirier
2010-07-16 23:21 ` Paul Walmsley
2010-07-17 6:18 ` Tomi.Valkeinen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.