Message ID | 1277670644.3028.11.camel@black |
---|---|
State | Accepted |
Delegated to: | Leann Ogasawara |
Headers | show |
On Sun, 2010-06-27 at 14:30 -0600, Mathieu Poirier wrote: > >From 48edfbaf0d38b9703c8e6ee43bb3d93dc6dc5a9e Mon Sep 17 00:00:00 2001 > From: Mathieu J. Poirier <mathieu.poirier@canonical.com> > Date: Sun, 27 Jun 2010 14:08:58 -0600 > Subject: [PATCH] UBUNTU - ARM: Adding regulator supply for vdds_sdi. > > 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 Poirier <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..2ab54d8 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"), Seems the above line violates coding style, ie. spaces instead of tab. > + 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", Is there a specific reason you remove the name attribute? > .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 > > > >
Given the critical nature of this patch in order to build Alpha2 images, I've gone ahead and applied it with the coding style cleanup. I also modified the title to follow the syntax of previously applied ARM related patches, ie UBUNTU: ARM: ... Thanks, Leann On Sun, 2010-06-27 at 17:18 -0700, Leann Ogasawara wrote: > On Sun, 2010-06-27 at 14:30 -0600, Mathieu Poirier wrote: > > >From 48edfbaf0d38b9703c8e6ee43bb3d93dc6dc5a9e Mon Sep 17 00:00:00 2001 > > From: Mathieu J. Poirier <mathieu.poirier@canonical.com> > > Date: Sun, 27 Jun 2010 14:08:58 -0600 > > Subject: [PATCH] UBUNTU - ARM: Adding regulator supply for vdds_sdi. > > > > 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 Poirier <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..2ab54d8 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"), > > Seems the above line violates coding style, ie. spaces instead of tab. > > > + 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", > > Is there a specific reason you remove the name attribute? > > > .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 > > > > > > > > > > >
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 69b154c..2ab54d8 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 = {