diff mbox

[v2] omap2: ehci: Make Overo compile again

Message ID 20090922161559.GA9767@lixom.net (mailing list archive)
State Accepted
Commit d6e0043604d57226dd9388f988a608dabb2f6a84
Headers show

Commit Message

Olof Johansson Sept. 22, 2009, 4:15 p.m. UTC 
Overo needs the same changes as the other platforms do for the ehci changes.

Also, roll in the corresponding change from Steve Sakoman fixing the
port setup (removing the redundant GPIO setup and switching to port 2).

Signed-off-by: Olof Johansson <olof@lixom.net>

---

--
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

Comments

Tony Lindgren Sept. 22, 2009, 5:15 p.m. UTC | #1 
* Olof Johansson <olof@lixom.net> [090922 09:00]:
> Overo needs the same changes as the other platforms do for the ehci changes.
> 
> Also, roll in the corresponding change from Steve Sakoman fixing the
> port setup (removing the redundant GPIO setup and switching to port 2).
>
> Signed-off-by: Olof Johansson <olof@lixom.net>

Sakoman, does this look OK to you?

Tony

> 
> ---
> 
> diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
> index 17f2318..75bdc09 100644
> --- a/arch/arm/mach-omap2/board-overo.c
> +++ b/arch/arm/mach-omap2/board-overo.c
> @@ -384,6 +384,19 @@ static struct platform_device *overo_devices[] __initdata = {
>  	&overo_lcd_device,
>  };
>  
> +static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
> +	.port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
> +	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
> +	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
> +
> +	.chargepump = false,
> +	.phy_reset  = true,
> +	.reset_gpio_port[0]  = -EINVAL,
> +	.reset_gpio_port[1]  = OVERO_GPIO_USBH_NRESET,
> +	.reset_gpio_port[2]  = -EINVAL
> +};
> +
> +
>  static void __init overo_init(void)
>  {
>  	overo_i2c_init();
> @@ -391,7 +404,7 @@ static void __init overo_init(void)
>  	omap_serial_init();
>  	overo_flash_init();
>  	usb_musb_init();
> -	usb_ehci_init(EHCI_HCD_OMAP_MODE_PHY, false, true, 183, -EINVAL);
> +	usb_ehci_init(&ehci_pdata);
>  	overo_ads7846_init();
>  	overo_init_smsc911x();
>  
> @@ -434,14 +447,6 @@ static void __init overo_init(void)
>  	else
>  		printk(KERN_ERR "could not obtain gpio for "
>  					"OVERO_GPIO_USBH_CPEN\n");
> -
> -	if ((gpio_request(OVERO_GPIO_USBH_NRESET,
> -			  "OVERO_GPIO_USBH_NRESET") == 0) &&
> -	    (gpio_direction_output(OVERO_GPIO_USBH_NRESET, 1) == 0))
> -		gpio_export(OVERO_GPIO_USBH_NRESET, 0);
> -	else
> -		printk(KERN_ERR "could not obtain gpio for "
> -					"OVERO_GPIO_USBH_NRESET\n");
>  }
>  
>  static void __init overo_map_io(void)
--
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
Steve Sakoman Sept. 22, 2009, 5:33 p.m. UTC | #2 
On Tue, Sep 22, 2009 at 10:15 AM, Tony Lindgren <tony@atomide.com> wrote:
> * Olof Johansson <olof@lixom.net> [090922 09:00]:
>> Overo needs the same changes as the other platforms do for the ehci changes.
>>
>> Also, roll in the corresponding change from Steve Sakoman fixing the
>> port setup (removing the redundant GPIO setup and switching to port 2).
>>
>> Signed-off-by: Olof Johansson <olof@lixom.net>
>
> Sakoman, does this look OK to you?

Yes, looks correct to me.

Acked-by: Steve Sakoman <steve@sakoman.com>


Steve


>> diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
>> index 17f2318..75bdc09 100644
>> --- a/arch/arm/mach-omap2/board-overo.c
>> +++ b/arch/arm/mach-omap2/board-overo.c
>> @@ -384,6 +384,19 @@ static struct platform_device *overo_devices[] __initdata = {
>>       &overo_lcd_device,
>>  };
>>
>> +static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
>> +     .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
>> +     .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
>> +     .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
>> +
>> +     .chargepump = false,
>> +     .phy_reset  = true,
>> +     .reset_gpio_port[0]  = -EINVAL,
>> +     .reset_gpio_port[1]  = OVERO_GPIO_USBH_NRESET,
>> +     .reset_gpio_port[2]  = -EINVAL
>> +};
>> +
>> +
>>  static void __init overo_init(void)
>>  {
>>       overo_i2c_init();
>> @@ -391,7 +404,7 @@ static void __init overo_init(void)
>>       omap_serial_init();
>>       overo_flash_init();
>>       usb_musb_init();
>> -     usb_ehci_init(EHCI_HCD_OMAP_MODE_PHY, false, true, 183, -EINVAL);
>> +     usb_ehci_init(&ehci_pdata);
>>       overo_ads7846_init();
>>       overo_init_smsc911x();
>>
>> @@ -434,14 +447,6 @@ static void __init overo_init(void)
>>       else
>>               printk(KERN_ERR "could not obtain gpio for "
>>                                       "OVERO_GPIO_USBH_CPEN\n");
>> -
>> -     if ((gpio_request(OVERO_GPIO_USBH_NRESET,
>> -                       "OVERO_GPIO_USBH_NRESET") == 0) &&
>> -         (gpio_direction_output(OVERO_GPIO_USBH_NRESET, 1) == 0))
>> -             gpio_export(OVERO_GPIO_USBH_NRESET, 0);
>> -     else
>> -             printk(KERN_ERR "could not obtain gpio for "
>> -                                     "OVERO_GPIO_USBH_NRESET\n");
>>  }
>>
>>  static void __init overo_map_io(void)
>
--
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
Tony Lindgren Sept. 22, 2009, 5:36 p.m. UTC | #3 
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: ehci

Initial commit ID (Likely to change): d6e0043604d57226dd9388f988a608dabb2f6a84

PatchWorks
http://patchwork.kernel.org/patch/49344/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=d6e0043604d57226dd9388f988a608dabb2f6a84


--
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
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 17f2318..75bdc09 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -384,6 +384,19 @@  static struct platform_device *overo_devices[] __initdata = {
 	&overo_lcd_device,
 };
 
+static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
+	.port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
+	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+
+	.chargepump = false,
+	.phy_reset  = true,
+	.reset_gpio_port[0]  = -EINVAL,
+	.reset_gpio_port[1]  = OVERO_GPIO_USBH_NRESET,
+	.reset_gpio_port[2]  = -EINVAL
+};
+
+
 static void __init overo_init(void)
 {
 	overo_i2c_init();
@@ -391,7 +404,7 @@  static void __init overo_init(void)
 	omap_serial_init();
 	overo_flash_init();
 	usb_musb_init();
-	usb_ehci_init(EHCI_HCD_OMAP_MODE_PHY, false, true, 183, -EINVAL);
+	usb_ehci_init(&ehci_pdata);
 	overo_ads7846_init();
 	overo_init_smsc911x();
 
@@ -434,14 +447,6 @@  static void __init overo_init(void)
 	else
 		printk(KERN_ERR "could not obtain gpio for "
 					"OVERO_GPIO_USBH_CPEN\n");
-
-	if ((gpio_request(OVERO_GPIO_USBH_NRESET,
-			  "OVERO_GPIO_USBH_NRESET") == 0) &&
-	    (gpio_direction_output(OVERO_GPIO_USBH_NRESET, 1) == 0))
-		gpio_export(OVERO_GPIO_USBH_NRESET, 0);
-	else
-		printk(KERN_ERR "could not obtain gpio for "
-					"OVERO_GPIO_USBH_NRESET\n");
 }
 
 static void __init overo_map_io(void)