Re: [U-Boot-Users] [PATCH] Add support for OMAP5912 and OMAP16xx to usbdcore_omap1510.c

[Jean-Christophe PLAGNIOL-VILLARD]

On 18:59 Sat 26 Jul , Hunter, Jon wrote:
 Add support to drivers/usb/usbdcore_omap1510.c for OMAP5912 and OMAP16xx 
 devices.
 
 Signed-off-by: Jon Hunter [EMAIL PROTECTED]
 ---
  drivers/usb/usbdcore_omap1510.c |   27 ---
  1 files changed, 24 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/usb/usbdcore_omap1510.c b/drivers/usb/usbdcore_omap1510.c
 index 84bb936..61c0d3b 100644
 --- a/drivers/usb/usbdcore_omap1510.c
 +++ b/drivers/usb/usbdcore_omap1510.c
 @@ -28,7 +28,7 @@
Applyinf failled

error: patch failed: drivers/usb/usbdcore_omap1510.c:28
error: drivers/usb/usbdcore_omap1510.c: patch does not apply
Using index info to reconstruct a base tree...
error: patch failed: drivers/usb/usbdcore_omap1510.c:1109
error: drivers/usb/usbdcore_omap1510.c: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.

Could you send a V2 rebase on the current tree?

Best Regards,
J.

-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK  win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users

[U-Boot-Users] [PATCH] Add support for OMAP5912 and OMAP16xx to usbdcore_omap1510.c

[Hunter, Jon]

Add support to drivers/usb/usbdcore_omap1510.c for OMAP5912 and OMAP16xx 
devices.

Signed-off-by: Jon Hunter [EMAIL PROTECTED]
---
 drivers/usb/usbdcore_omap1510.c |   27 ---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/usbdcore_omap1510.c b/drivers/usb/usbdcore_omap1510.c
index 84bb936..61c0d3b 100644
--- a/drivers/usb/usbdcore_omap1510.c
+++ b/drivers/usb/usbdcore_omap1510.c
@@ -28,7 +28,7 @@

 #include common.h

-#if defined(CONFIG_OMAP1510)  defined(CONFIG_USB_DEVICE)
+#if ((defined(CONFIG_OMAP1510) || defined(CONFIG_OMAP1610))  
defined(CONFIG_USB_DEVICE))

 #include asm/io.h
 #ifdef CONFIG_OMAP_SX1
@@ -1109,21 +1109,42 @@ int udc_init (void)
 */
outw ((1  4) | (1  5), CLOCK_CTRL);
UDCREG (CLOCK_CTRL);
+
+#ifdef CONFIG_OMAP1510
+   /* This code was originally implemented for OMAP1510 and
+* therefore is only applicable for OMAP1510 boards. For
+* OMAP5912 or OMAP16xx the register APLL_CTRL does not
+* exist and DPLL_CTRL is already configured.
+*/
+
/* Set and check APLL */
outw (0x0008, APLL_CTRL);
UDCREG (APLL_CTRL);
/* Set and check DPLL */
outw (0x2210, DPLL_CTRL);
UDCREG (DPLL_CTRL);
-   /* Set and check SOFT */
-   outw ((1  4) | (1  3) | 1, SOFT_REQ);
+#endif
+   /* Set and check SOFT
+* The below line of code has been changed to perform a
+* read-modify-write instead of a simple write for
+* configuring the SOFT_REQ register. This allows the code
+* to be compatible with OMAP5912 and OMAP16xx devices
+*/
+   outw ((1  4) | (1  3) | 1 | (inw(SOFT_REQ)), SOFT_REQ);
/* Short delay to wait for DPLL */
udelay (1000);

/* Print banner with device revision */
udc_rev = inw (UDC_REV)  0xff;
+#ifdef CONFIG_OMAP1510
printf (USB:   TI OMAP1510 USB function module rev %d.%d\n,
udc_rev  4, udc_rev  0xf);
+#endif
+
+#ifdef CONFIG_OMAP1610
+   printf (USB:   TI OMAP5912 USB function module rev %d.%d\n,
+   udc_rev  4, udc_rev  0xf);
+#endif

 #ifdef CONFIG_OMAP_SX1
i2c_read (0x32, 0x04, 1, value, 1);
--
1.4.4.4

-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK  win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users