kernel-power v42 -> kernel-bfs

[kernel-bfs] / kernel-bfs-2.6.28 / debian / patches / nokia-20103103+0m5.diff

diff --git a/kernel-bfs-2.6.28/debian/patches/nokia-20103103+0m5.diff b/kernel-bfs-2.6.28/debian/patches/nokia-20103103+0m5.diff
index a493b7d..ced2b28 100644 (file)
--- a/kernel-bfs-2.6.28/debian/patches/nokia-20103103+0m5.diff
+++ b/kernel-bfs-2.6.28/debian/patches/nokia-20103103+0m5.diff
@@ -1131,49 +1131,6 @@
        }
  
        wl1251_debug(DEBUG_BOOT, "tx %s cmd channel %d",
---- kernel-power-2.6.28.orig/drivers/usb/musb/musb_core.c
-+++ kernel-power-2.6.28/drivers/usb/musb/musb_core.c
-@@ -297,28 +297,23 @@
-                       break;
-       }
- 
--      if (vdat) {
--              /* REVISIT: This code works only with dedicated chargers!
--               * When support for HOST/HUB chargers is added, don't
--               * forget this.
--               */
-+      /* enable interrupts */
-+      musb_writeb(musb->mregs, MUSB_INTRUSBE, ctx.intrusbe);
-+
-+      /* Make sure the communication starts normally */
-+      r = musb_readb(musb->mregs, MUSB_POWER);
-+      musb_writeb(musb->mregs, MUSB_POWER,
-+                      r | MUSB_POWER_RESUME);
-+      msleep(10);
-+      musb_writeb(musb->mregs, MUSB_POWER,
-+                      r & ~MUSB_POWER_RESUME);
-+      if (vdat && musb->xceiv->state != OTG_STATE_B_IDLE) {
-               musb_stop(musb);
-               /* Regulators off */
-               otg_set_suspend(musb->xceiv, 1);
--              musb->is_charger = 1;
--      } else {
--              /* enable interrupts */
--              musb_writeb(musb->mregs, MUSB_INTRUSBE, ctx.intrusbe);
--
--              /* Make sure the communication starts normally */
--              r = musb_readb(musb->mregs, MUSB_POWER);
--              musb_writeb(musb->mregs, MUSB_POWER,
--                              r | MUSB_POWER_RESUME);
--              msleep(10);
--              musb_writeb(musb->mregs, MUSB_POWER,
--                              r & ~MUSB_POWER_RESUME);
-       }
- 
-+      musb->is_charger = vdat;
-       check_charger = 0;
- 
-       return vdat;
 --- kernel-power-2.6.28.orig/include/linux/sched.h
 +++ kernel-power-2.6.28/include/linux/sched.h
 @@ -1665,11 +1665,11 @@