Re: [Patch v4] AM35xx: Craneboard: Add USB EHCI support

2010-12-17 Thread Sergei Shtylyov

Hello.

On 16-12-2010 18:25, srin...@mistralsolutions.com wrote:


From: Srinath srin...@mistralsolutions.com



AM3517/05 Craneboard has one EHCI interface on board using port1.



GPIO35 is used as power enable.
GPIO38 is used as port1 PHY reset.



History:
http://marc.info/?l=linux-omapw=2r=1s=Craneboard%3A+Add+USB+EHCI+supportq=t



Signed-off-by: Srinath srin...@mistralsolutions.com
---
  arch/arm/mach-omap2/board-am3517crane.c |   53 +++
  1 files changed, 53 insertions(+), 0 deletions(-)



diff --git a/arch/arm/mach-omap2/board-am3517crane.c 
b/arch/arm/mach-omap2/board-am3517crane.c
index 8ba4047..1a80175 100644
--- a/arch/arm/mach-omap2/board-am3517crane.c
+++ b/arch/arm/mach-omap2/board-am3517crane.c

[...]

@@ -51,10 +58,56 @@ static void __init am3517_crane_init_irq(void)

[...]

  static void __init am3517_crane_init(void)
  {
+   int ret;
+
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
omap_serial_init();
+
+   /* Configure GPIO for EHCI port */
+   if (omap_mux_init_gpio(GPIO_USB_NRESET, OMAP_PIN_OUTPUT)) {
+   pr_err(Can not cofigure mux for GPIO_USB_NRESET %d\n,
+   GPIO_USB_NRESET);
+   return;
+   }
+
+   if (omap_mux_init_gpio(GPIO_USB_POWER, OMAP_PIN_OUTPUT)) {
+   pr_err(Can not cofigure mux for GPIO_USB_POWER %d\n,
+


   Empty line not needed here...


+   GPIO_USB_POWER);
+   return;
+   }
+
+   ret = gpio_request(GPIO_USB_POWER, usb_ehci_enable);
+   if (ret  0) {
+   pr_err(Cannot request GPIO %d\n, GPIO_USB_POWER);
+   return;
+   }
+
+   ret = gpio_direction_output(GPIO_USB_POWER, 1);
+   if (ret  0)
+   goto err;
+
+


   Too  many empty lines here...


+   usb_ehci_init(ehci_pdata);
+   return;
+
+err:


   There's no need for *goto* and label.


+   gpio_free(GPIO_USB_POWER);
+   pr_err(Unable to initialize EHCI power\n);
+   return;
  }


WBR, Sergei
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Patch v4] AM35xx: Craneboard: Add USB EHCI support

2010-12-16 Thread srinath
From: Srinath srin...@mistralsolutions.com

AM3517/05 Craneboard has one EHCI interface on board using port1.

GPIO35 is used as power enable.
GPIO38 is used as port1 PHY reset.

History:
http://marc.info/?l=linux-omapw=2r=1s=Craneboard%3A+Add+USB+EHCI+supportq=t

Signed-off-by: Srinath srin...@mistralsolutions.com
---
 arch/arm/mach-omap2/board-am3517crane.c |   53 +++
 1 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-am3517crane.c 
b/arch/arm/mach-omap2/board-am3517crane.c
index 8ba4047..1a80175 100644
--- a/arch/arm/mach-omap2/board-am3517crane.c
+++ b/arch/arm/mach-omap2/board-am3517crane.c
@@ -19,6 +19,7 @@
 
 #include linux/kernel.h
 #include linux/init.h
+#include linux/gpio.h
 
 #include mach/hardware.h
 #include asm/mach-types.h
@@ -27,8 +28,14 @@
 
 #include plat/board.h
 #include plat/common.h
+#include plat/usb.h
 
 #include mux.h
+#include control.h
+
+#define GPIO_USB_POWER 35
+#define GPIO_USB_NRESET38
+
 
 /* Board initialization */
 static struct omap_board_config_kernel am3517_crane_config[] __initdata = {
@@ -51,10 +58,56 @@ static void __init am3517_crane_init_irq(void)
omap_init_irq();
 }
 
+static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = {
+   .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
+   .port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+   .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+
+   .phy_reset  = true,
+   .reset_gpio_port[0]  = GPIO_USB_NRESET,
+   .reset_gpio_port[1]  = -EINVAL,
+   .reset_gpio_port[2]  = -EINVAL
+};
+
 static void __init am3517_crane_init(void)
 {
+   int ret;
+
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
omap_serial_init();
+
+   /* Configure GPIO for EHCI port */
+   if (omap_mux_init_gpio(GPIO_USB_NRESET, OMAP_PIN_OUTPUT)) {
+   pr_err(Can not cofigure mux for GPIO_USB_NRESET %d\n,
+   GPIO_USB_NRESET);
+   return;
+   }
+
+   if (omap_mux_init_gpio(GPIO_USB_POWER, OMAP_PIN_OUTPUT)) {
+   pr_err(Can not cofigure mux for GPIO_USB_POWER %d\n,
+
+   GPIO_USB_POWER);
+   return;
+   }
+
+   ret = gpio_request(GPIO_USB_POWER, usb_ehci_enable);
+   if (ret  0) {
+   pr_err(Cannot request GPIO %d\n, GPIO_USB_POWER);
+   return;
+   }
+
+   ret = gpio_direction_output(GPIO_USB_POWER, 1);
+   if (ret  0)
+   goto err;
+
+
+   usb_ehci_init(ehci_pdata);
+   return;
+
+err:
+   gpio_free(GPIO_USB_POWER);
+   pr_err(Unable to initialize EHCI power\n);
+   return;
 }
 
 MACHINE_START(CRANEBOARD, AM3517/05 CRANEBOARD)
-- 
1.7.1.226.g770c5

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html