diff mbox

ARM: OMAP4: PCM049: remove vusim regulator

Message ID 1310554762-10743-1-git-send-email-j.weitzel@phytec.de (mailing list archive)
State New, archived
Headers show

Commit Message

Jan Weitzel July 13, 2011, 10:59 a.m. UTC
vusim is not used.

Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
---
 arch/arm/mach-omap2/board-omap4pcm049.c |   16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)

Comments

Sergei Shtylyov July 13, 2011, 12:13 p.m. UTC | #1
Hello.

On 13-07-2011 14:59, Jan Weitzel wrote:

> vusim is not used.

> Signed-off-by: Jan Weitzel<j.weitzel@phytec.de>
> ---
>   arch/arm/mach-omap2/board-omap4pcm049.c |   16 +---------------
>   1 files changed, 1 insertions(+), 15 deletions(-)

> diff --git a/arch/arm/mach-omap2/board-omap4pcm049.c b/arch/arm/mach-omap2/board-omap4pcm049.c
> index ad8cb46..85193ec 100644
> --- a/arch/arm/mach-omap2/board-omap4pcm049.c
> +++ b/arch/arm/mach-omap2/board-omap4pcm049.c
[...]
> @@ -318,9 +306,7 @@ static struct i2c_board_info __initdata pcm049_i2c_4_boardinfo[] = {
>   	}
>   };
>
> -static struct twl4030_platform_data pcm049_twldata = {
> -	.vusim		=&pcm049_vusim,
> -};
> +static struct twl4030_platform_data pcm049_twldatai;

    Have you added that 'i' at the end intentionally?

WBR, Sergei
Jan Weitzel July 13, 2011, 12:56 p.m. UTC | #2
Am Mittwoch, den 13.07.2011, 16:13 +0400 schrieb Sergei Shtylyov:

> 
>     Have you added that 'i' at the end intentionally?
> 
Thank you. It was a tribute to vim.

Jan
Tony Lindgren July 14, 2011, 7:34 a.m. UTC | #3
* Jan Weitzel <J.Weitzel@phytec.de> [110713 05:51]:
> Am Mittwoch, den 13.07.2011, 16:13 +0400 schrieb Sergei Shtylyov:
> 
> > 
> >     Have you added that 'i' at the end intentionally?
> > 
> Thank you. It was a tribute to vim.

:i)

I'll fold the fixed patch into your original patch. Will also
keep the new board files in testing-board because of the code
coalescing and device tree conversion effort.

Tony
Jan Weitzel July 14, 2011, 8:39 a.m. UTC | #4
Am Donnerstag, den 14.07.2011, 00:34 -0700 schrieb Tony Lindgren:
> * Jan Weitzel <J.Weitzel@phytec.de> [110713 05:51]:
> > Am Mittwoch, den 13.07.2011, 16:13 +0400 schrieb Sergei Shtylyov:
> > 
> > > 
> > >     Have you added that 'i' at the end intentionally?
> > > 
> > Thank you. It was a tribute to vim.
> 
> :i)
> 
> I'll fold the fixed patch into your original patch. Will also
> keep the new board files in testing-board because of the code
> coalescing and device tree conversion effort.

So there is no way to get the board mainline yet?

Jan

> Tony
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Tony Lindgren July 15, 2011, 7:50 a.m. UTC | #5
* Jan Weitzel <J.Weitzel@phytec.de> [110714 01:34]:
> Am Donnerstag, den 14.07.2011, 00:34 -0700 schrieb Tony Lindgren:
> > * Jan Weitzel <J.Weitzel@phytec.de> [110713 05:51]:
> > > Am Mittwoch, den 13.07.2011, 16:13 +0400 schrieb Sergei Shtylyov:
> > > 
> > > > 
> > > >     Have you added that 'i' at the end intentionally?
> > > > 
> > > Thank you. It was a tribute to vim.
> > 
> > :i)
> > 
> > I'll fold the fixed patch into your original patch. Will also
> > keep the new board files in testing-board because of the code
> > coalescing and device tree conversion effort.
> 
> So there is no way to get the board mainline yet?

Well we can add it even before device tree support if it makes
sense from code coalescing point of view. In this case it would
mean creating board-panda-common.c or similar so the code can
be shared amongst the panda variants.

It seems that some GPIO pins are different and there are some
difference in devices connected, but big parts of the code can be
shared.

Adding the pending boards without combining code would be adding code
that will be going away for most part with the device tree support.

And most likely the beagle and panda based boards will be the first
ones to work with device tree. So anything we can do to have common
board init code will also help with this effort.

Regards,

Tony
Felipe Balbi July 15, 2011, 7:58 a.m. UTC | #6
Hi,

On Fri, Jul 15, 2011 at 12:50:24AM -0700, Tony Lindgren wrote:
> * Jan Weitzel <J.Weitzel@phytec.de> [110714 01:34]:
> > Am Donnerstag, den 14.07.2011, 00:34 -0700 schrieb Tony Lindgren:
> > > * Jan Weitzel <J.Weitzel@phytec.de> [110713 05:51]:
> > > > Am Mittwoch, den 13.07.2011, 16:13 +0400 schrieb Sergei Shtylyov:
> > > > 
> > > > > 
> > > > >     Have you added that 'i' at the end intentionally?
> > > > > 
> > > > Thank you. It was a tribute to vim.
> > > 
> > > :i)
> > > 
> > > I'll fold the fixed patch into your original patch. Will also
> > > keep the new board files in testing-board because of the code
> > > coalescing and device tree conversion effort.
> > 
> > So there is no way to get the board mainline yet?
> 
> Well we can add it even before device tree support if it makes
> sense from code coalescing point of view. In this case it would
> mean creating board-panda-common.c or similar so the code can
> be shared amongst the panda variants.
> 
> It seems that some GPIO pins are different and there are some
> difference in devices connected, but big parts of the code can be
> shared.

isn't it easier than to just add a few if (machine_is_xxxx()) checks and
another MACHINE_START() to board-omap4panda.c rather than creating a new
file, shuffling code around and then adding a new board file ??
Tony Lindgren July 15, 2011, 8:20 a.m. UTC | #7
* Felipe Balbi <balbi@ti.com> [110715 00:53]:
> Hi,
> 
> On Fri, Jul 15, 2011 at 12:50:24AM -0700, Tony Lindgren wrote:
> > * Jan Weitzel <J.Weitzel@phytec.de> [110714 01:34]:
> > > Am Donnerstag, den 14.07.2011, 00:34 -0700 schrieb Tony Lindgren:
> > > > * Jan Weitzel <J.Weitzel@phytec.de> [110713 05:51]:
> > > > > Am Mittwoch, den 13.07.2011, 16:13 +0400 schrieb Sergei Shtylyov:
> > > > > 
> > > > > > 
> > > > > >     Have you added that 'i' at the end intentionally?
> > > > > > 
> > > > > Thank you. It was a tribute to vim.
> > > > 
> > > > :i)
> > > > 
> > > > I'll fold the fixed patch into your original patch. Will also
> > > > keep the new board files in testing-board because of the code
> > > > coalescing and device tree conversion effort.
> > > 
> > > So there is no way to get the board mainline yet?
> > 
> > Well we can add it even before device tree support if it makes
> > sense from code coalescing point of view. In this case it would
> > mean creating board-panda-common.c or similar so the code can
> > be shared amongst the panda variants.
> > 
> > It seems that some GPIO pins are different and there are some
> > difference in devices connected, but big parts of the code can be
> > shared.
> 
> isn't it easier than to just add a few if (machine_is_xxxx()) checks and
> another MACHINE_START() to board-omap4panda.c rather than creating a new
> file, shuffling code around and then adding a new board file ??

That works too if the init_machine does not get too complicated.

Regards,

Tony
Jan Weitzel July 15, 2011, 9:47 a.m. UTC | #8
Am Freitag, den 15.07.2011, 00:50 -0700 schrieb Tony Lindgren:
> Well we can add it even before device tree support if it makes
> sense from code coalescing point of view. In this case it would
> mean creating board-panda-common.c or similar so the code can
> be shared amongst the panda variants.
> 
> It seems that some GPIO pins are different and there are some
> difference in devices connected, but big parts of the code can be
> shared.
> 
> Adding the pending boards without combining code would be adding code
> that will be going away for most part with the device tree support.
> 
> And most likely the beagle and panda based boards will be the first
> ones to work with device tree. So anything we can do to have common
> board init code will also help with this effort.
> 
> Regards,
> 
> Tony
pcm049 and panda board have some more different devices.
I am working on patches to add NAND support and using tlv320aic3x audio
codec which need regulators in platformcode. I need a hack to controll
usb otg by gpio (controlling a external power circuit). The patches are
not mainline ready by now. 
If using machine_is_xxxx() in board-omap4panda.c then also is good way,
I could provide our board as patches on top of board-omap4panda.c.
When will pandaboard use device tree to boot?

Kind Regards,
Jan
Tony Lindgren July 15, 2011, 10:55 a.m. UTC | #9
* Jan Weitzel <J.Weitzel@phytec.de> [110715 02:42]:
> Am Freitag, den 15.07.2011, 00:50 -0700 schrieb Tony Lindgren:
> > Well we can add it even before device tree support if it makes
> > sense from code coalescing point of view. In this case it would
> > mean creating board-panda-common.c or similar so the code can
> > be shared amongst the panda variants.
> > 
> > It seems that some GPIO pins are different and there are some
> > difference in devices connected, but big parts of the code can be
> > shared.
> > 
> > Adding the pending boards without combining code would be adding code
> > that will be going away for most part with the device tree support.
> > 
> > And most likely the beagle and panda based boards will be the first
> > ones to work with device tree. So anything we can do to have common
> > board init code will also help with this effort.
> > 
> > Regards,
> > 
> > Tony
> pcm049 and panda board have some more different devices.
> I am working on patches to add NAND support and using tlv320aic3x audio
> codec which need regulators in platformcode. I need a hack to controll
> usb otg by gpio (controlling a external power circuit). The patches are
> not mainline ready by now. 

OK, let's figure out how we can add the basic support first then.

> If using machine_is_xxxx() in board-omap4panda.c then also is good way,
> I could provide our board as patches on top of board-omap4panda.c.
> When will pandaboard use device tree to boot?

Yes, but it would better just to use separate .init_machine entries to
initialize thing. Gpio entries can be initialized along the lines of the
recent beagle commit 5fe8b4c19dc24e3bb873daf9e96a2439a83bbd79 that adds
support for beagl xm board. Except you already have a separate machine_id,
so no runtime detection is needed.

That avoids adding the machine_is entries all over the place that tend
to cause problems when some other panda variant is added as it requires
patching in multiple places.

Regards,

Tony
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/board-omap4pcm049.c b/arch/arm/mach-omap2/board-omap4pcm049.c
index ad8cb46..85193ec 100644
--- a/arch/arm/mach-omap2/board-omap4pcm049.c
+++ b/arch/arm/mach-omap2/board-omap4pcm049.c
@@ -227,18 +227,6 @@  static struct platform_device pcm049_vcc_3v3_device = {
 	},
 };
 
-static struct regulator_init_data pcm049_vusim = {
-	.constraints = {
-		.min_uV			= 1800000,
-		.max_uV			= 3300000,
-		.apply_uV		= true,
-		.valid_modes_mask	= REGULATOR_MODE_NORMAL
-					| REGULATOR_MODE_STANDBY,
-		.valid_ops_mask	 =	REGULATOR_CHANGE_MODE
-					| REGULATOR_CHANGE_STATUS,
-	},
-};
-
 static struct at24_platform_data board_eeprom = {
 	.byte_len = 4096,
 	.page_size = 32,
@@ -318,9 +306,7 @@  static struct i2c_board_info __initdata pcm049_i2c_4_boardinfo[] = {
 	}
 };
 
-static struct twl4030_platform_data pcm049_twldata = {
-	.vusim		= &pcm049_vusim,
-};
+static struct twl4030_platform_data pcm049_twldatai;
 
 static int __init pcm049_i2c_init(void)
 {