Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 15 insertions, 76 deletions

diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index be5fb34d9602..774545494cf2 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -46,6 +46,7 @@
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
 #include <linux/io.h>
+#include <linux/prefetch.h>
 
 #include <asm/byteorder.h>
 #include <asm/dma.h>
@@ -139,24 +140,6 @@ static const char ep0name [] = "ep0";
 static void pxa25x_ep_fifo_flush (struct usb_ep *ep);
 static void nuke (struct pxa25x_ep *, int status);
 
-/* one GPIO should be used to detect VBUS from the host */
-static int is_vbus_present(void)
-{
-        struct pxa2xx_udc_mach_info             *mach = the_controller->mach;
-
-        if (gpio_is_valid(mach->gpio_vbus)) {
-                int value = gpio_get_value(mach->gpio_vbus);
-
-                if (mach->gpio_vbus_inverted)
-                        return !value;
-                else
-                        return !!value;
-        }
-        if (mach->udc_is_connected)
-                return mach->udc_is_connected();
-        return 1;
-}
-
 /* one GPIO should control a D+ pullup, so host sees this device (or not) */
 static void pullup_off(void)
 {
@@ -1055,7 +1038,7 @@ udc_seq_show(struct seq_file *m, void *_d)
                 "%s version: %s\nGadget driver: %s\nHost %s\n\n",
                 driver_name, DRIVER_VERSION SIZE_STR "(pio)",
                 dev->driver ? dev->driver->driver.name : "(none)",
-                is_vbus_present() ? "full speed" : "disconnected");
+                dev->gadget.speed == USB_SPEED_FULL ? "full speed" : "disconnected");
 
         /* registers for device and ep0 */
         seq_printf(m,
@@ -1094,7 +1077,7 @@ udc_seq_show(struct seq_file *m, void *_d)
                         (tmp & UDCCFR_ACM) ? " acm" : "");
         }
 
-        if (!is_vbus_present() || !dev->driver)
+        if (dev->gadget.speed != USB_SPEED_FULL || !dev->driver)
                 goto done;
 
         seq_printf(m, "ep0 IN %lu/%lu, OUT %lu/%lu\nirqs %lu\n\n",
@@ -1280,14 +1263,15 @@ static void udc_enable (struct pxa25x_udc *dev)
  * disconnect is reported.  then a host may connect again, or
  * the driver might get unbound.
  */
-int usb_gadget_register_driver(struct usb_gadget_driver *driver)
+int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
+                int (*bind)(struct usb_gadget *))
 {
         struct pxa25x_udc       *dev = the_controller;
         int                     retval;
 
         if (!driver
                         || driver->speed < USB_SPEED_FULL
-                        || !driver->bind
+                        || !bind
                         || !driver->disconnect
                         || !driver->setup)
                 return -EINVAL;
@@ -1308,7 +1292,7 @@ fail:
                 dev->gadget.dev.driver = NULL;
                 return retval;
         }
-        retval = driver->bind(&dev->gadget);
+        retval = bind(&dev->gadget);
         if (retval) {
                 DMSG("bind to driver %s --> error %d\n",
                                 driver->driver.name, retval);
@@ -1338,7 +1322,7 @@ fail:
 bind_fail:
         return retval;
 }
-EXPORT_SYMBOL(usb_gadget_register_driver);
+EXPORT_SYMBOL(usb_gadget_probe_driver);
 
 static void
 stop_activity(struct pxa25x_udc *dev, struct usb_gadget_driver *driver)
@@ -1434,14 +1418,6 @@ lubbock_vbus_irq(int irq, void *_dev)
 
 #endif
 
-static irqreturn_t udc_vbus_irq(int irq, void *_dev)
-{
-        struct pxa25x_udc       *dev = _dev;
-
-        pxa25x_udc_vbus_session(&dev->gadget, is_vbus_present());
-        return IRQ_HANDLED;
-}
-
 
 /*-------------------------------------------------------------------------*/
 
@@ -1765,12 +1741,9 @@ pxa25x_udc_irq(int irq, void *_dev)
                 if (unlikely(udccr & UDCCR_SUSIR)) {
                         udc_ack_int_UDCCR(UDCCR_SUSIR);
                         handled = 1;
-                        DBG(DBG_VERBOSE, "USB suspend%s\n", is_vbus_present()
-                                ? "" : "+disconnect");
+                        DBG(DBG_VERBOSE, "USB suspend\n");
 
-                        if (!is_vbus_present())
-                                stop_activity(dev, dev->driver);
-                        else if (dev->gadget.speed != USB_SPEED_UNKNOWN
+                        if (dev->gadget.speed != USB_SPEED_UNKNOWN
                                         && dev->driver
                                         && dev->driver->suspend)
                                 dev->driver->suspend(&dev->gadget);
@@ -1785,8 +1758,7 @@ pxa25x_udc_irq(int irq, void *_dev)
 
                         if (dev->gadget.speed != USB_SPEED_UNKNOWN
                                         && dev->driver
-                                        && dev->driver->resume
-                                        && is_vbus_present())
+                                        && dev->driver->resume)
                                 dev->driver->resume(&dev->gadget);
                 }
 
@@ -2136,7 +2108,7 @@ static struct pxa25x_udc memory = {
 static int __init pxa25x_udc_probe(struct platform_device *pdev)
 {
         struct pxa25x_udc *dev = &memory;
-        int retval, vbus_irq, irq;
+        int retval, irq;
         u32 chiprev;
 
         /* insist on Intel/ARM/XScale */
@@ -2198,19 +2170,6 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
 
         dev->transceiver = otg_get_transceiver();
 
-        if (gpio_is_valid(dev->mach->gpio_vbus)) {
-                if ((retval = gpio_request(dev->mach->gpio_vbus,
-                                "pxa25x_udc GPIO VBUS"))) {
-                        dev_dbg(&pdev->dev,
-                                "can't get vbus gpio %d, err: %d\n",
-                                dev->mach->gpio_vbus, retval);
-                        goto err_gpio_vbus;
-                }
-                gpio_direction_input(dev->mach->gpio_vbus);
-                vbus_irq = gpio_to_irq(dev->mach->gpio_vbus);
-        } else
-                vbus_irq = 0;
-
         if (gpio_is_valid(dev->mach->gpio_pullup)) {
                 if ((retval = gpio_request(dev->mach->gpio_pullup,
                                 "pca25x_udc GPIO PULLUP"))) {
@@ -2236,7 +2195,7 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
         udc_disable(dev);
         udc_reinit(dev);
 
-        dev->vbus = !!is_vbus_present();
+        dev->vbus = 0;
 
         /* irq setup after old hardware state is cleaned up */
         retval = request_irq(irq, pxa25x_udc_irq,
@@ -2257,7 +2216,6 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
                 if (retval != 0) {
                         pr_err("%s: can't get irq %i, err %d\n",
                                 driver_name, LUBBOCK_USB_DISC_IRQ, retval);
-lubbock_fail0:
                         goto err_irq_lub;
                 }
                 retval = request_irq(LUBBOCK_USB_IRQ,
@@ -2267,39 +2225,24 @@ lubbock_fail0:
                 if (retval != 0) {
                         pr_err("%s: can't get irq %i, err %d\n",
                                 driver_name, LUBBOCK_USB_IRQ, retval);
-                        free_irq(LUBBOCK_USB_DISC_IRQ, dev);
                         goto lubbock_fail0;
                 }
         } else
 #endif
-        if (vbus_irq) {
-                retval = request_irq(vbus_irq, udc_vbus_irq,
-                                IRQF_DISABLED | IRQF_SAMPLE_RANDOM |
-                                IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-                                driver_name, dev);
-                if (retval != 0) {
-                        pr_err("%s: can't get irq %i, err %d\n",
-                                driver_name, vbus_irq, retval);
-                        goto err_vbus_irq;
-                }
-        }
         create_debug_files(dev);
 
         return 0;
 
- err_vbus_irq:
 #ifdef  CONFIG_ARCH_LUBBOCK
+lubbock_fail0:
         free_irq(LUBBOCK_USB_DISC_IRQ, dev);
  err_irq_lub:
-#endif
         free_irq(irq, dev);
+#endif
  err_irq1:
         if (gpio_is_valid(dev->mach->gpio_pullup))
                 gpio_free(dev->mach->gpio_pullup);
  err_gpio_pullup:
-        if (gpio_is_valid(dev->mach->gpio_vbus))
-                gpio_free(dev->mach->gpio_vbus);
- err_gpio_vbus:
         if (dev->transceiver) {
                 otg_put_transceiver(dev->transceiver);
                 dev->transceiver = NULL;
@@ -2336,10 +2279,6 @@ static int __exit pxa25x_udc_remove(struct platform_device *pdev)
                 free_irq(LUBBOCK_USB_IRQ, dev);
         }
 #endif
-        if (gpio_is_valid(dev->mach->gpio_vbus)) {
-                free_irq(gpio_to_irq(dev->mach->gpio_vbus), dev);
-                gpio_free(dev->mach->gpio_vbus);
-        }
         if (gpio_is_valid(dev->mach->gpio_pullup))
                 gpio_free(dev->mach->gpio_pullup);