r2236 - trunk/src/target/u-boot/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-06-13 08:09:14 +0200 (Wed, 13 Jun 2007)
New Revision: 2236

Modified:
   trunk/src/target/u-boot/patches/neo1973-chargefast.patch
Log:
use pcf50606 fastcharge codepath only for GTA01


Modified: trunk/src/target/u-boot/patches/neo1973-chargefast.patch
===================================================================
--- trunk/src/target/u-boot/patches/neo1973-chargefast.patch	2007-06-12 22:57:45 UTC (rev 2235)
+++ trunk/src/target/u-boot/patches/neo1973-chargefast.patch	2007-06-13 06:09:14 UTC (rev 2236)
@@ -1,7 +1,7 @@
 Index: u-boot/drivers/usbtty.c
 ===================================================================
---- u-boot.orig/drivers/usbtty.c	2007-03-28 16:04:29.000000000 +0200
-+++ u-boot/drivers/usbtty.c	2007-03-28 16:07:19.000000000 +0200
+--- u-boot.orig/drivers/usbtty.c
++++ u-boot/drivers/usbtty.c
 @@ -66,7 +66,7 @@
  /*
   * Defines
@@ -263,8 +263,8 @@
  
 Index: u-boot/drivers/usbtty.h
 ===================================================================
---- u-boot.orig/drivers/usbtty.h	2007-03-28 16:04:29.000000000 +0200
-+++ u-boot/drivers/usbtty.h	2007-03-28 18:25:44.000000000 +0200
+--- u-boot.orig/drivers/usbtty.h
++++ u-boot/drivers/usbtty.h
 @@ -60,7 +60,7 @@
  #define USBTTY_DEVICE_CLASS	COMMUNICATIONS_DEVICE_CLASS
  
@@ -276,22 +276,34 @@
  #define STR_MANUFACTURER	0x01
 Index: u-boot/board/neo1973/common/udc.c
 ===================================================================
---- u-boot.orig/board/neo1973/common/udc.c	2007-03-28 16:05:09.000000000 +0200
-+++ u-boot/board/neo1973/common/udc.c	2007-03-28 16:07:22.000000000 +0200
-@@ -16,6 +16,9 @@
+--- u-boot.orig/board/neo1973/common/udc.c
++++ u-boot/board/neo1973/common/udc.c
+@@ -2,6 +2,7 @@
+ #include <common.h>
+ #include <usbdcore.h>
+ #include <s3c2410.h>
++#include <pcf50606.h>
+ 
+ void udc_ctrl(enum usbd_event event, int param)
+ {
+@@ -17,6 +18,13 @@
  			gpio->GPBDAT &= ~(1 << 9);
  #endif
  		break;
 +	case UDC_CTRL_500mA_ENABLE:
++#if defined(CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4) || \
++    defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) \
++    defined(CONFIG_ARCH_GTA01B_v4)
 +		pcf50606_charge_autofast(param);
++#endif
 +		break;
  	default:
  		break;
  	}
 Index: u-boot/include/usbdcore.h
 ===================================================================
---- u-boot.orig/include/usbdcore.h	2007-03-28 16:05:05.000000000 +0200
-+++ u-boot/include/usbdcore.h	2007-03-28 18:25:46.000000000 +0200
+--- u-boot.orig/include/usbdcore.h
++++ u-boot/include/usbdcore.h
 @@ -686,8 +686,8 @@
  
  enum usbd_event {