[PATCH] linux-2.6-windriver: omap3: beaglexm: fix EHCI power up GPIO dir

[PATCH] linux-2.6-windriver: omap3: beaglexm: fix EHCI power up GPIO dir

[Darren Hart]

The following patch from Koen's angstrom-linux repository fixes initialization
of the Beagleboard xM's on-board USB hub and makes it possible to use the
on-board network port.

Please merge contrib/dvhart/beagleboard-standard with beagleboard-standard.

Pull URL: git://git.pokylinux.org/linux-2.6-windriver-contrib.git
  Branch: dvhart/beagleboard-standard
  Browse: http://git.pokylinux.org/cgit.cgi/linux-2.6-windriver-contrib/log/?h=dvhart/beagleboard-standard

Thanks,
    Darren Hart <dvhart@linux.intel.com>


From 23a104853de8cdb351b7747af799463215dc4d8c Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@beagleboard.org>
Date: Tue, 11 Jan 2011 17:13:35 +0000
Subject: [PATCH] omap3: beaglexm: fix EHCI power up GPIO dir

commit a5624323866c06156ca548b8515d9347fdd5188e angstrom-linux

EHCI enable power pin is inverted (active high) in comparison
to vanilla beagle which is active low. Handle this case conditionally.

Without this fix, Beagle XM 4 port EHCI will not function and no
networking will be available

[nm@ti.com: split up, added descriptive changelogs]
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Koen Kooi <koen@beagleboard.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/board-omap3beagle.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 5bcf6ee..80c203c 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -250,9 +250,15 @@ static int beagle_twl_gpio_setup(struct device *dev,
 	gpio_request(gpio + 1, "EHCI_nOC");
 	gpio_direction_input(gpio + 1);
 
-	/* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
+	/*
+	 * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active
+	 * high / others active low)
+	 */
 	gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
-	gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
+		gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
+	else
+		gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
 
 	/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
 	gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
-- 
1.7.1
-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Re: [PATCH] linux-2.6-windriver: omap3: beaglexm: fix EHCI power up GPIO dir

[Koen Kooi]

Op 21 jan 2011, om 20:45 heeft Darren Hart het volgende geschreven:

> The following patch from Koen's angstrom-linux repository fixes initialization
> of the Beagleboard xM's on-board USB hub and makes it possible to use the
> on-board network port.

FWIW, that patch will be in 2.6.38rc1 :)


> 
> Please merge contrib/dvhart/beagleboard-standard with beagleboard-standard.
> 
> Pull URL: git://git.pokylinux.org/linux-2.6-windriver-contrib.git
>  Branch: dvhart/beagleboard-standard
>  Browse: http://git.pokylinux.org/cgit.cgi/linux-2.6-windriver-contrib/log/?h=dvhart/beagleboard-standard
> 
> Thanks,
>    Darren Hart <dvhart@linux.intel.com>
> 
> 
> From 23a104853de8cdb351b7747af799463215dc4d8c Mon Sep 17 00:00:00 2001
> From: Koen Kooi <koen@beagleboard.org>
> Date: Tue, 11 Jan 2011 17:13:35 +0000
> Subject: [PATCH] omap3: beaglexm: fix EHCI power up GPIO dir
> 
> commit a5624323866c06156ca548b8515d9347fdd5188e angstrom-linux
> 
> EHCI enable power pin is inverted (active high) in comparison
> to vanilla beagle which is active low. Handle this case conditionally.
> 
> Without this fix, Beagle XM 4 port EHCI will not function and no
> networking will be available
> 
> [nm@ti.com: split up, added descriptive changelogs]
> Signed-off-by: Nishanth Menon <nm@ti.com>
> Signed-off-by: Koen Kooi <koen@beagleboard.org>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
> arch/arm/mach-omap2/board-omap3beagle.c |   10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
> index 5bcf6ee..80c203c 100644
> --- a/arch/arm/mach-omap2/board-omap3beagle.c
> +++ b/arch/arm/mach-omap2/board-omap3beagle.c
> @@ -250,9 +250,15 @@ static int beagle_twl_gpio_setup(struct device *dev,
> 	gpio_request(gpio + 1, "EHCI_nOC");
> 	gpio_direction_input(gpio + 1);
> 
> -	/* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
> +	/*
> +	 * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active
> +	 * high / others active low)
> +	 */
> 	gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
> -	gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
> +	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
> +		gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
> +	else
> +		gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
> 
> 	/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
> 	gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
> -- 
> 1.7.1
> -- 
> Darren Hart
> Intel Open Source Technology Center
> Yocto Project - Linux Kernel
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky

Re: [PATCH] linux-2.6-windriver: omap3: beaglexm: fix EHCI power up GPIO dir

[Darren Hart]

On 01/21/2011 02:31 PM, Koen Kooi wrote:
>
> Op 21 jan 2011, om 20:45 heeft Darren Hart het volgende geschreven:
>
>> The following patch from Koen's angstrom-linux repository fixes initialization
>> of the Beagleboard xM's on-board USB hub and makes it possible to use the
>> on-board network port.
>
> FWIW, that patch will be in 2.6.38rc1 :)

Thanks, it looked pretty straight forward, so I figured it was targeted 
for upstream. Going forward, are there any branches I should avoid 
pulling from - or any particular branch I should restrict my pulls to?

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel