* [PATCH] omap2: ehci: Make Overo compile again
@ 2009-09-22 15:04 Olof Johansson
2009-09-22 16:15 ` [PATCH v2] " Olof Johansson
0 siblings, 1 reply; 5+ messages in thread
From: Olof Johansson @ 2009-09-22 15:04 UTC (permalink / raw)
To: linux-omap; +Cc: Ajay Kumar Gupta, tony
Overo needs the same changes as the other boards do for the ehci changes.
Signed-off-by: Olof Johansson <olof@lixom.net>
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 17f2318..3994974 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_PHY,
+ .port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+ .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+
+ .chargepump = false,
+ .phy_reset = true,
+ .reset_gpio_port[0] = 183,
+ .reset_gpio_port[1] = -EINVAL,
+ .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();
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2] omap2: ehci: Make Overo compile again
2009-09-22 15:04 [PATCH] omap2: ehci: Make Overo compile again Olof Johansson
@ 2009-09-22 16:15 ` Olof Johansson
2009-09-22 17:15 ` Tony Lindgren
2009-09-22 17:36 ` [APPLIED] " Tony Lindgren
0 siblings, 2 replies; 5+ messages in thread
From: Olof Johansson @ 2009-09-22 16:15 UTC (permalink / raw)
To: linux-omap; +Cc: Ajay Kumar Gupta, tony, sakoman
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>
---
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)
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] omap2: ehci: Make Overo compile again
2009-09-22 16:15 ` [PATCH v2] " Olof Johansson
@ 2009-09-22 17:15 ` Tony Lindgren
2009-09-22 17:33 ` Steve Sakoman
2009-09-22 17:36 ` [APPLIED] " Tony Lindgren
1 sibling, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2009-09-22 17:15 UTC (permalink / raw)
To: Olof Johansson; +Cc: linux-omap, Ajay Kumar Gupta, sakoman
* 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)
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] omap2: ehci: Make Overo compile again
2009-09-22 17:15 ` Tony Lindgren
@ 2009-09-22 17:33 ` Steve Sakoman
0 siblings, 0 replies; 5+ messages in thread
From: Steve Sakoman @ 2009-09-22 17:33 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Olof Johansson, linux-omap, Ajay Kumar Gupta
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [APPLIED] [PATCH v2] omap2: ehci: Make Overo compile again
2009-09-22 16:15 ` [PATCH v2] " Olof Johansson
2009-09-22 17:15 ` Tony Lindgren
@ 2009-09-22 17:36 ` Tony Lindgren
1 sibling, 0 replies; 5+ messages in thread
From: Tony Lindgren @ 2009-09-22 17:36 UTC (permalink / raw)
To: linux-omap
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-09-22 17:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-22 15:04 [PATCH] omap2: ehci: Make Overo compile again Olof Johansson
2009-09-22 16:15 ` [PATCH v2] " Olof Johansson
2009-09-22 17:15 ` Tony Lindgren
2009-09-22 17:33 ` Steve Sakoman
2009-09-22 17:36 ` [APPLIED] " Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox