* [PATCH 0/2] beagle: making DVI output work again
@ 2011-01-28 3:49 Ricardo Salveti de Araujo
2011-01-28 3:49 ` [PATCH 1/2] omap3: beagle: adding regulator supply for vdds_sdi Ricardo Salveti de Araujo
2011-01-28 3:49 ` [PATCH 2/2] omap3: beaglexm: fix DVI initialization Ricardo Salveti de Araujo
0 siblings, 2 replies; 4+ messages in thread
From: Ricardo Salveti de Araujo @ 2011-01-28 3:49 UTC (permalink / raw)
To: linux-omap; +Cc: Ricardo Salveti de Araujo
Hello,
These 2 patches are basically bugfixing to make DVI work again on beagle.
Tested with Beagle-xM and C4.
Mathieu J. Poirier (1):
omap3: beagle: adding regulator supply for vdds_sdi.
Ricardo Salveti de Araujo (1):
omap3: beaglexm: fix DVI initialization
arch/arm/mach-omap2/board-omap3beagle.c | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
--
1.7.2.3
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] omap3: beagle: adding regulator supply for vdds_sdi.
2011-01-28 3:49 [PATCH 0/2] beagle: making DVI output work again Ricardo Salveti de Araujo
@ 2011-01-28 3:49 ` Ricardo Salveti de Araujo
2011-01-28 3:49 ` [PATCH 2/2] omap3: beaglexm: fix DVI initialization Ricardo Salveti de Araujo
1 sibling, 0 replies; 4+ messages in thread
From: Ricardo Salveti de Araujo @ 2011-01-28 3:49 UTC (permalink / raw)
To: linux-omap; +Cc: Mathieu J. Poirier, Leann Ogasawara
From: Mathieu J. Poirier <mathieu.poirier@canonical.com>
The omapfb driver couldn't locate its display sink because of
an initialisation error in the DSS subsystem. This error was
caused by a missing 'sdi' entry in the board power regulator list.
BugLink: https://bugs.launchpad.net/bugs/597904
Signed-off-by: Mathieu J. Poirier <mathieu.poirier@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@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 46d814a..685ac06 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -239,8 +239,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)
{
@@ -419,7 +421,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
@@ -427,8 +428,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.2.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] omap3: beaglexm: fix DVI initialization
2011-01-28 3:49 [PATCH 0/2] beagle: making DVI output work again Ricardo Salveti de Araujo
2011-01-28 3:49 ` [PATCH 1/2] omap3: beagle: adding regulator supply for vdds_sdi Ricardo Salveti de Araujo
@ 2011-01-28 3:49 ` Ricardo Salveti de Araujo
2011-01-28 6:46 ` Varadarajan, Charulatha
1 sibling, 1 reply; 4+ messages in thread
From: Ricardo Salveti de Araujo @ 2011-01-28 3:49 UTC (permalink / raw)
To: linux-omap; +Cc: Ricardo Salveti de Araujo
Function beagle_twl_gpio_setup is called after beagle_display_init, what
makes lets reset_gpio with an invalid value at the time it request the
gpio. As a side effect the DVI reset GPIO is not properly set.
Also removing old code that power down DVI in a hardcoded way, as it's
not necessary anymore.
Tested with Beagle-xM and C4.
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
---
arch/arm/mach-omap2/board-omap3beagle.c | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 685ac06..c8ab478 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -248,6 +248,12 @@ static void __init beagle_display_init(void)
{
int r;
+ /* DVI reset GPIO is different between beagle revisions */
+ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
+ beagle_dvi_device.reset_gpio = 129;
+ else
+ beagle_dvi_device.reset_gpio = 170;
+
r = gpio_request(beagle_dvi_device.reset_gpio, "DVI reset");
if (r < 0) {
printk(KERN_ERR "Unable to get DVI reset GPIO\n");
@@ -324,12 +330,6 @@ static int beagle_twl_gpio_setup(struct device *dev,
else
gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
- /* DVI reset GPIO is different between beagle revisions */
- if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
- beagle_dvi_device.reset_gpio = 129;
- else
- beagle_dvi_device.reset_gpio = 170;
-
/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
@@ -620,11 +620,6 @@ static void __init omap3_beagle_init(void)
ARRAY_SIZE(omap3_beagle_devices));
omap_serial_init();
- omap_mux_init_gpio(170, OMAP_PIN_INPUT);
- gpio_request(170, "DVI_nPD");
- /* REVISIT leave DVI powered down until it's needed ... */
- gpio_direction_output(170, true);
-
usb_musb_init(&musb_board_data);
usb_ehci_init(&ehci_pdata);
omap3beagle_flash_init();
--
1.7.2.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] omap3: beaglexm: fix DVI initialization
2011-01-28 3:49 ` [PATCH 2/2] omap3: beaglexm: fix DVI initialization Ricardo Salveti de Araujo
@ 2011-01-28 6:46 ` Varadarajan, Charulatha
0 siblings, 0 replies; 4+ messages in thread
From: Varadarajan, Charulatha @ 2011-01-28 6:46 UTC (permalink / raw)
To: Ricardo Salveti de Araujo; +Cc: linux-omap
On Fri, Jan 28, 2011 at 09:19, Ricardo Salveti de Araujo
<ricardo.salveti@canonical.com> wrote:
> Function beagle_twl_gpio_setup is called after beagle_display_init, what
> makes lets reset_gpio with an invalid value at the time it request the
> gpio. As a side effect the DVI reset GPIO is not properly set.
>
> Also removing old code that power down DVI in a hardcoded way, as it's
> not necessary anymore.
>
> Tested with Beagle-xM and C4.
>
> Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
> ---
> arch/arm/mach-omap2/board-omap3beagle.c | 17 ++++++-----------
> 1 files changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
> index 685ac06..c8ab478 100644
> --- a/arch/arm/mach-omap2/board-omap3beagle.c
> +++ b/arch/arm/mach-omap2/board-omap3beagle.c
> @@ -248,6 +248,12 @@ static void __init beagle_display_init(void)
> {
> int r;
>
> + /* DVI reset GPIO is different between beagle revisions */
> + if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
> + beagle_dvi_device.reset_gpio = 129;
Define a macro for this gpio and use it here.
> + else
> + beagle_dvi_device.reset_gpio = 170;
Ditto.
> +
Where is the mux configuration (omap_mux_init_gpio()) done for this gpio?
-V Charulatha
> r = gpio_request(beagle_dvi_device.reset_gpio, "DVI reset");
> if (r < 0) {
> printk(KERN_ERR "Unable to get DVI reset GPIO\n");
> @@ -324,12 +330,6 @@ static int beagle_twl_gpio_setup(struct device *dev,
> else
> gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
>
> - /* DVI reset GPIO is different between beagle revisions */
> - if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
> - beagle_dvi_device.reset_gpio = 129;
> - else
> - beagle_dvi_device.reset_gpio = 170;
> -
> /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
> gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
>
> @@ -620,11 +620,6 @@ static void __init omap3_beagle_init(void)
> ARRAY_SIZE(omap3_beagle_devices));
> omap_serial_init();
>
> - omap_mux_init_gpio(170, OMAP_PIN_INPUT);
> - gpio_request(170, "DVI_nPD");
> - /* REVISIT leave DVI powered down until it's needed ... */
> - gpio_direction_output(170, true);
> -
> usb_musb_init(&musb_board_data);
> usb_ehci_init(&ehci_pdata);
> omap3beagle_flash_init();
> --
> 1.7.2.3
--
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] 4+ messages in thread
end of thread, other threads:[~2011-01-28 6:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-28 3:49 [PATCH 0/2] beagle: making DVI output work again Ricardo Salveti de Araujo
2011-01-28 3:49 ` [PATCH 1/2] omap3: beagle: adding regulator supply for vdds_sdi Ricardo Salveti de Araujo
2011-01-28 3:49 ` [PATCH 2/2] omap3: beaglexm: fix DVI initialization Ricardo Salveti de Araujo
2011-01-28 6:46 ` Varadarajan, Charulatha
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.