Changeset 13811

Timestamp:

02/02/10 18:00:32 (3 years ago)

Author:

BrainSlayer

Message:

ar7241/ar7242 ehci

Location:

src/linux/pb42/linux-2.6.23/drivers/usb

Files:

• core/Makefile (modified) (1 diff)
• core/hub.c (modified) (2 diffs)
• gadget/ar9130_udc.c (modified) (2 diffs)
• gadget/ether.c (modified) (1 diff)
• gadget/gadget_chips.h (modified) (2 diffs)

src/linux/pb42/linux-2.6.23/drivers/usb/core/Makefile

@@ -20 +20 @@
 EXTRA_CFLAGS += -DDEBUG
 endif
+ifdef AP_USB_LED_GPIO
+CFLAGS_hub.o += -DAP_USB_LED_GPIO
+endif

src/linux/pb42/linux-2.6.23/drivers/usb/core/hub.c

@@ -1170 +1170 @@
         dev_info (&udev->dev, "USB disconnect, address %d\n", udev->devnum);
 
+#ifdef AP_USB_LED_GPIO
+        /* Turn USB LED off only if its a last device attached to root hub */
+        if(udev->parent == udev->bus->root_hub)
+                ap_usb_led_off();       
+#endif
+
         usb_lock_device(udev);
 
@@ -2082 +2088 @@
                                 /* success, speed is known */
         retval = -ENODEV;
+#ifdef AP_USB_LED_GPIO
+                        ap_usb_led_on();
+#endif
 
         if (oldspeed != USB_SPEED_UNKNOWN && oldspeed != udev->speed) {

src/linux/pb42/linux-2.6.23/drivers/usb/gadget/ar9130_udc.c

@@ -1970 +1970 @@
     ar9130_reg_rmw_clear(AR9130_RESET,AR9130_RESET_USB_HOST);
     ar9130_reg_rmw_set(AR9130_RESET,AR9130_RESET_USB_PHY);  //PHY RESET
+#endif
+
+    if (is_ar7242() || is_ar7241()) {
+        ar9130_reg_rmw_set(AR9130_RESET,AR9130_RESET_USBSUS_OVRIDE);
+        mdelay(10);
+        ar9130_reg_wr(AR9130_RESET,((ar9130_reg_rd(AR9130_RESET) & ~(AR9130_RESET_USB_HOST)) |
+                                                                  AR9130_RESET_USBSUS_OVRIDE));
+        mdelay(10);
+        ar9130_reg_wr(AR9130_RESET,((ar9130_reg_rd(AR9130_RESET) & ~(AR9130_RESET_USB_PHY)) |
+                                                                   AR9130_RESET_USBSUS_OVRIDE));
+        mdelay(10);
+    }
+    else {
+
+        ar9130_reg_rmw_clear(AR9130_RESET,AR9130_RESET_USB_PHY);//PHY CLEAR RESET
+        ar9130_debug_dev("AR9130_RESET %x \n",ar9130_reg_rd(AR9130_RESET));
+        mdelay(10);
+        ar9130_reg_rmw_clear(AR9130_RESET,AR9130_RESET_USB_HOST); // 6th March 
+        mdelay(10);
+    }
 
     /* Setting 16-bit mode */
@@ -1975 +1995 @@
     ar9130_debug_dev("PORT_STATUS[0] %x\n",readl(&udc->op_base->portscx[0]));
     mdelay(10);
-#endif
-    ar9130_reg_rmw_clear(AR9130_RESET,AR9130_RESET_USB_PHY);//PHY CLEAR RESET
-    ar9130_debug_dev("AR9130_RESET %x \n",ar9130_reg_rd(AR9130_RESET));
-    mdelay(10);
-
-    ar9130_reg_rmw_clear(AR9130_RESET,AR9130_RESET_USB_HOST); // 6th March 
-    mdelay(10);
+
 
 
     /* Clear Host Mode */
-    ar9130_reg_rmw_clear(AR9130_USB_CONFIG,(1 << 2));
+    if (is_ar7242() || is_ar7241()) {
+        ar9130_reg_rmw_clear(AR9130_USB_CONFIG,(1 << 8));
+    }
+    else {
+         ar9130_reg_rmw_clear(AR9130_USB_CONFIG,(1 << 2));
+    }
     ar9130_debug_dev("Usb Config Reg %x\n",ar9130_reg_rd(AR9130_USB_CONFIG));
     mdelay(10);

src/linux/pb42/linux-2.6.23/drivers/usb/gadget/ether.c

@@ -285 +285 @@
 #define DEV_CONFIG_CDC
 #endif
+
+#ifdef CONFIG_USB_GADGET_AR9130
+#define DEV_CONFIG_CDC
+#endif
+
+
 
 /* For CDC-incapable hardware, choose the simple cdc subset.

src/linux/pb42/linux-2.6.23/drivers/usb/gadget/gadget_chips.h

@@ -146 +146 @@
 #else
 #define gadget_is_m66592(g)     0
+#endif
+
+#ifdef CONFIG_USB_GADGET_AR9130
+#define gadget_is_ar9130(g)     !strcmp("ar9130_udc", (g)->name)
+#else
+#define gadget_is_ar9130(g)     0
 #endif
 
@@ -213 +219 @@
         else if (gadget_is_m66592(gadget))
                 return 0x21;
+        else if (gadget_is_ar9130(gadget)) 
+                return 0x22;
         return -ENOENT;
 }