r1331 - trunk/src/target/kernel/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-03-12 22:03:43 +0100 (Mon, 12 Mar 2007)
New Revision: 1331

Added:
   trunk/src/target/kernel/patches/g_ether-vendor_product.patch
Modified:
   trunk/src/target/kernel/patches/series
Log:
use FIC's USB Vendor/Product IDs


Added: trunk/src/target/kernel/patches/g_ether-vendor_product.patch
===================================================================
--- trunk/src/target/kernel/patches/g_ether-vendor_product.patch	2007-03-12 17:35:45 UTC (rev 1330)
+++ trunk/src/target/kernel/patches/g_ether-vendor_product.patch	2007-03-12 21:03:43 UTC (rev 1331)
@@ -0,0 +1,34 @@
+Use FIC's own USB Vendor ID rather than NetChip's
+
+Yes, we could solve this by some modprobe.conf parameters, but I'd like to
+rather not rely on this.
+
+Index: linux-2.6.20.1/drivers/usb/gadget/ether.c
+===================================================================
+--- linux-2.6.20.1.orig/drivers/usb/gadget/ether.c	2007-03-12 21:57:28.000000000 +0100
++++ linux-2.6.20.1/drivers/usb/gadget/ether.c	2007-03-12 22:01:28.000000000 +0100
+@@ -149,11 +149,8 @@
+  * Instead:  allocate your own, using normal USB-IF procedures.
+  */
+ 
+-/* Thanks to NetChip Technologies for donating this product ID.
+- * It's for devices with only CDC Ethernet configurations.
+- */
+-#define CDC_VENDOR_NUM	0x0525		/* NetChip */
+-#define CDC_PRODUCT_NUM	0xa4a1		/* Linux-USB Ethernet Gadget */
++#define CDC_VENDOR_NUM	0x1457		/* First International Computer */
++#define CDC_PRODUCT_NUM	0x5117		/* Linux-USB Ethernet Gadget */
+ 
+ /* For hardware that can't talk CDC, we use the same vendor ID that
+  * ARM Linux has used for ethernet-over-usb, both with sa1100 and
+@@ -174,8 +171,8 @@
+  * used with CDC Ethernet, Linux 2.4 hosts will need updates to choose
+  * the non-RNDIS configuration.
+  */
+-#define RNDIS_VENDOR_NUM	0x0525	/* NetChip */
+-#define RNDIS_PRODUCT_NUM	0xa4a2	/* Ethernet/RNDIS Gadget */
++#define RNDIS_VENDOR_NUM	0x1457	/* NetChip */
++#define RNDIS_PRODUCT_NUM	0x5122	/* Ethernet/RNDIS Gadget */
+ 
+ 
+ /* Some systems will want different product identifers published in the

Modified: trunk/src/target/kernel/patches/series
===================================================================
--- trunk/src/target/kernel/patches/series	2007-03-12 17:35:45 UTC (rev 1330)
+++ trunk/src/target/kernel/patches/series	2007-03-12 21:03:43 UTC (rev 1331)
@@ -7,6 +7,7 @@
 i2c-permit_invalid_addrs.patch
 pm-debug_less_verbose.patch
 g_ether-highpower.patch
+g_ether-vendor_product.patch
 2.6.20-s3c2410fb_uninitialized.patch
 2.6.17-s3c2410-spi-mode23.patch
 s3c2410_serial-nodebug.patch