Removed duplicated and unused patches
authorPali Rohár <pali.rohar@gmail.com>
Sat, 16 Apr 2011 00:32:12 +0000 (02:32 +0200)
committerPali Rohár <pali.rohar@gmail.com>
Sat, 16 Apr 2011 00:32:12 +0000 (02:32 +0200)
kernel-power-2.6.28/debian/patches/bq24150-sniff.diff [deleted file]
kernel-power-2.6.28/debian/patches/kexec.diff [deleted file]
kernel-power-2.6.28/debian/patches/leds-lp5523.diff [deleted file]
kernel-power-2.6.28/debian/patches/minstrel-aziwoqpa.diff [deleted file]
kernel-power-2.6.28/debian/patches/series
kernel-power-2.6.28/debian/patches/usbhostmode.diff [deleted file]
kernel-power-2.6.28/debian/patches/usbwhitelist.diff [deleted file]

diff --git a/kernel-power-2.6.28/debian/patches/bq24150-sniff.diff b/kernel-power-2.6.28/debian/patches/bq24150-sniff.diff
deleted file mode 100644 (file)
index 78d6c80..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
---- kernel-power-2.6.28.orig/drivers/i2c/i2c-core.c
-+++ kernel-power-2.6.28/drivers/i2c/i2c-core.c
-@@ -1042,7 +1042,26 @@
-                               (msgs[ret].flags & I2C_M_RECV_LEN) ? "+" : "");
-               }
- #endif
--
-+              // inserted
-+              int i;
-+              if (msgs[0].addr == 0x6b) {
-+                printk("%s ", dev_name(&adap->dev));
-+                for (ret = 0; ret < num; ret++) { // nr of messages in this call
-+                  if (!(msgs[ret].flags & I2C_M_RD)) {
-+                    printk("(W):");
-+                    for (i = 0; i < msgs[ret].len; i++) {
-+                      printk(" 0x%02x", msgs[ret].buf[i]);
-+                    }
-+                  }
-+                  else {
-+                    printk("(R) %d bytes", msgs[ret].len);
-+                  }
-+                  printk(", ");
-+                }
-+                printk("\n");
-+              }
-+              // end inserted
-+              
-               if (in_atomic() || irqs_disabled()) {
-                       ret = mutex_trylock(&adap->bus_lock);
-                       if (!ret)
-@@ -1054,7 +1073,20 @@
-               ret = adap->algo->master_xfer(adap,msgs,num);
-               mutex_unlock(&adap->bus_lock);
--
-+              
-+              // inserted
-+              int j;
-+              for (i = 0; i < num; i++) {
-+                if (msgs[i].addr == 0x6b && (msgs[i].flags & I2C_M_RD)) {
-+                  printk("i2c_read: ");
-+                  for (j = 0; j < msgs[i].len; j++) {
-+                    printk(" 0x%02x", msgs[i].buf[j]);
-+                  }
-+                  printk("\n");
-+                }
-+              }
-+              // end inserted
-+              
-               return ret;
-       } else {
-               dev_dbg(&adap->dev, "I2C level transfers not supported\n");
diff --git a/kernel-power-2.6.28/debian/patches/kexec.diff b/kernel-power-2.6.28/debian/patches/kexec.diff
deleted file mode 100644 (file)
index 5f3aecf..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
---- kernel-maemo-2.6.28.orig/arch/arm/boot/compressed/head.S
-+++ kernel-maemo-2.6.28/arch/arm/boot/compressed/head.S
-@@ -27,6 +27,14 @@
-               .macro  writeb, ch, rb
-               mcr     p14, 0, \ch, c0, c5, 0
-               .endm
-+elif defined(CONFIG_CPU_V7)
-+              .macro  loadsp, rb
-+              .endm
-+              .macro  writeb, ch, rb
-+wait:         mrc     p14, 0, pc, c0, c1, 0
-+              bcs     wait
-+              mcr     p14, 0, \ch, c0, c5, 0
-+              .endm
- #else
-               .macro  loadsp, rb
-               .endm
---- kernel-maemo-2.6.28.orig/arch/arm/boot/compressed/misc.c
-+++ kernel-maemo-2.6.28/arch/arm/boot/compressed/misc.c
-@@ -47,6 +47,17 @@
-       asm("mcr p14, 0, %0, c0, c5, 0" : : "r" (ch));
- }
-+#elif defined(CONFIG_CPU_V7)
-+
-+static void icedcc_putc(int ch)
-+{
-+      asm(
-+      "wait:  mrc     p14, 0, pc, c0, c1, 0                   \n\
-+              bcs     wait                                    \n\
-+              mcr     p14, 0, %0, c0, c5, 0                   "
-+      : : "r" (ch));
-+}
-+
- #else
- static void icedcc_putc(int ch)
---- kernel-maemo-2.6.28.orig/arch/arm/include/asm/cacheflush.h
-+++ kernel-maemo-2.6.28/arch/arm/include/asm/cacheflush.h
-@@ -138,16 +138,16 @@
-  *    Please note that the implementation of these, and the required
-  *    effects are cache-type (VIVT/VIPT/PIPT) specific.
-  *
-- *    flush_cache_kern_all()
-+ *    flush_kern_all()
-  *
-  *            Unconditionally clean and invalidate the entire cache.
-  *
-- *    flush_cache_user_mm(mm)
-+ *    flush_user_all()
-  *
-  *            Clean and invalidate all user space cache entries
-  *            before a change of page tables.
-  *
-- *    flush_cache_user_range(start, end, flags)
-+ *    flush_user_range(start, end, flags)
-  *
-  *            Clean and invalidate a range of cache entries in the
-  *            specified address space before a change of page tables.
-@@ -163,6 +163,20 @@
-  *            - start  - virtual start address
-  *            - end    - virtual end address
-  *
-+ *    coherent_user_range(start, end)
-+ *
-+ *            Ensure coherency between the Icache and the Dcache in the
-+ *            region described by start, end.  If you have non-snooping
-+ *            Harvard caches, you need to implement this function.
-+ *            - start  - virtual start address
-+ *            - end    - virtual end address
-+ *
-+ *    flush_kern_dcache_area(kaddr, size)
-+ *
-+ *            Ensure that the data held in page is written back.
-+ *            - kaddr  - page address
-+ *            - size   - region size
-+ *
-  *    DMA Cache Coherency
-  *    ===================
-  *
---- kernel-maemo-2.6.28.orig/arch/arm/kernel/debug.S
-+++ kernel-maemo-2.6.28/arch/arm/kernel/debug.S
-@@ -49,6 +49,26 @@
- 1002:
-               .endm
-+#elif defined(CONFIG_CPU_V7)
-+
-+              .macro  addruart, rx
-+              .endm
-+
-+              .macro  senduart, rd, rx
-+              mcr     p14, 0, \rd, c0, c5, 0
-+              .endm
-+
-+              .macro  busyuart, rd, rx
-+busy:         mrc     p14, 0, pc, c0, c1, 0
-+              bcs     busy
-+              .endm
-+
-+              .macro  waituart, rd, rx
-+wait:         mrc     p14, 0, pc, c0, c1, 0
-+              bcs     wait
-+
-+              .endm
-+
- #else
-               .macro  addruart, rx
---- kernel-maemo-2.6.28.orig/arch/arm/mm/mmu.c
-+++ kernel-maemo-2.6.28/arch/arm/mm/mmu.c
-@@ -953,4 +953,6 @@
-               pmd[1] = __pmd(pmdval + (1 << (PGDIR_SHIFT - 1)));
-               flush_pmd_entry(pmd);
-       }
-+
-+      local_flush_tlb_all();
- }
---- kernel-maemo-2.6.28.orig/arch/arm/mm/proc-v6.S
-+++ kernel-maemo-2.6.28/arch/arm/mm/proc-v6.S
-@@ -56,8 +56,6 @@
-  *    to what would be the reset vector.
-  *
-  *    - loc   - location to jump to for soft reset
-- *
-- *    It is assumed that:
-  */
-       .align  5
- ENTRY(cpu_v6_reset)
---- kernel-maemo-2.6.28.orig/arch/arm/mm/proc-v7.S
-+++ kernel-maemo-2.6.28/arch/arm/mm/proc-v7.S
-@@ -28,7 +28,14 @@
- ENDPROC(cpu_v7_proc_init)
- ENTRY(cpu_v7_proc_fin)
--      mov     pc, lr
-+      stmfd   sp!, {lr}
-+      cpsid   if                              @ disable interrupts
-+      bl      v7_flush_kern_cache_all
-+      mrc     p15, 0, r0, c1, c0, 0           @ ctrl register
-+      bic     r0, r0, #0x1000                 @ ...i............
-+      bic     r0, r0, #0x0006                 @ .............ca.
-+      mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-+      ldmfd   sp!, {pc}
- ENDPROC(cpu_v7_proc_fin)
- /*
-@@ -39,8 +46,6 @@
-  *    to what would be the reset vector.
-  *
-  *    - loc   - location to jump to for soft reset
-- *
-- *    It is assumed that:
-  */
-       .align  5
- ENTRY(cpu_v7_reset)
diff --git a/kernel-power-2.6.28/debian/patches/leds-lp5523.diff b/kernel-power-2.6.28/debian/patches/leds-lp5523.diff
deleted file mode 100644 (file)
index d7dad77..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
---- kernel-power-2.6.28.orig/drivers/leds/leds-lp5523.c
-+++ kernel-power-2.6.28/drivers/leds/leds-lp5523.c
-@@ -120,6 +120,8 @@
-       u8                      led_nr;
-       u8                      led_current;
-       struct led_classdev     cdev;
-+      struct work_struct      work;
-+      u8 brightness;
- };
- struct lp5523_chip {
-@@ -472,10 +474,10 @@
-       return pos;
- }
--static void lp5523_set_brightness(struct led_classdev *cdev,
--                           enum led_brightness brightness)
-+static void lp5523_set_brightness_work(struct work_struct  *work)
- {
--      struct lp5523_led *led = cdev_to_led(cdev);
-+        struct lp5523_led *led =
-+                container_of(work, struct lp5523_led, work);
-       struct lp5523_chip *chip = led_to_lp5523(led);
-       struct i2c_client *client = chip->client;
-@@ -483,10 +485,20 @@
-       lp5523_write(client,
-                    LP5523_REG_LED_PWM_BASE + led->led_nr,
--                   (u8)brightness);
-+                   led->brightness);
-       mutex_unlock(&chip->lock);
- }
-+static void lp5523_set_brightness(struct led_classdev *cdev,
-+                           enum led_brightness brightness)
-+{
-+      struct lp5523_led *led = cdev_to_led(cdev);
-+      struct lp5523_chip *chip = led_to_lp5523(led);
-+      struct i2c_client *client = chip->client;
-+
-+      led->brightness = (u8)brightness;
-+      schedule_work(&led->work);
-+}
- static int lp5523_do_store_load(struct lp5523_engine *engine,
-                               const char *buf, size_t len)
-@@ -792,6 +804,7 @@
-       led->cdev.name = name;
-       led->cdev.brightness_set = lp5523_set_brightness;
-+      INIT_WORK( &led->work, lp5523_set_brightness_work); 
-       if (led_classdev_register(dev, &led->cdev) < 0) {
-               dev_err(dev, "couldn't register led %d\n", id);
-               return -1;
diff --git a/kernel-power-2.6.28/debian/patches/minstrel-aziwoqpa.diff b/kernel-power-2.6.28/debian/patches/minstrel-aziwoqpa.diff
deleted file mode 100644 (file)
index e1d9180..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- kernel-maemo-2.6.28.orig/net/mac80211/rc80211_minstrel.c
-+++ kernel-maemo-2.6.28/net/mac80211/rc80211_minstrel.c
-@@ -224,7 +224,7 @@
-       unsigned int sample_ndx;
-       sample_ndx = SAMPLE_TBL(mi, mi->sample_idx, mi->sample_column);
-       mi->sample_idx++;
--      if (mi->sample_idx > (mi->n_rates - 2)) {
-+      if (mi->n_rates == 1 || mi->sample_idx > (mi->n_rates - 2)) {
-               mi->sample_idx = 0;
-               mi->sample_column++;
-               if (mi->sample_column >= SAMPLE_COLUMNS)
index 8104c85..71a1367 100644 (file)
@@ -7,15 +7,12 @@ unionfs-2.5.3.diff
 dm-loop.diff
 usbip.diff
 #nilfs2-2.0.18.diff
-#minstrel-aziwoqpa.diff
 iphb-matan.diff
 ppp_async_matan.diff
 2.6.28.10.diff
 block2mtd-yoush.diff
 gentoo-fsfixes.diff
-#kexec.diff
 bq_matan.diff
-#leds-lp5523.diff
 trig-keyb.diff
 twl-scrollock.diff
 squashfs.diff
@@ -25,12 +22,6 @@ mmcnames-fanoush.diff
 gethercharge.diff
 ondemand-avoid.diff
 overclock.diff
-#usbwhitelist.diff
-#usbignpower.diff
-#nootg.diff
-#bq24150-sniff.diff
-#usbhost4.diff
-#usbhostmode.diff
 armthumb.diff
 wl12xx_rohar.diff
 fmtx.unlock.diff
diff --git a/kernel-power-2.6.28/debian/patches/usbhostmode.diff b/kernel-power-2.6.28/debian/patches/usbhostmode.diff
deleted file mode 100644 (file)
index 46c7c5b..0000000
+++ /dev/null
@@ -1,431 +0,0 @@
---- kernel-power-2.6.28.orig/arch/arm/mach-omap2/usb-musb.c
-+++ kernel-power-2.6.28/arch/arm/mach-omap2/usb-musb.c
-@@ -141,10 +141,13 @@
-       .config         = &musb_config,
-       /* REVISIT charge pump on TWL4030 can supply up to
--       * 100 mA ... but this value is board-specific, like
-+       * 200 mA ... but this value is board-specific, like
-        * "mode", and should be passed to usb_musb_init().
-+         *
-+         * Since the power can come from a Y-cable, let the user
-+         * decide on power constraints and not limit anything here.
-        */
--      .power          = 50,                   /* up to 100 mA */
-+      .power          = 0,                    /* use default of 500 mA */
- };
- static u64 musb_dmamask = DMA_32BIT_MASK;
---- kernel-power-2.6.28.orig/drivers/usb/core/otg_whitelist.h
-+++ kernel-power-2.6.28/drivers/usb/core/otg_whitelist.h
-@@ -14,7 +14,7 @@
- #else
- static inline int is_targeted(struct usb_device *d)
- {
--      return 0;
-+      return 1;
- }
- #endif
---- kernel-power-2.6.28.orig/drivers/usb/musb/musb_core.c
-+++ kernel-power-2.6.28/drivers/usb/musb/musb_core.c
-@@ -230,6 +230,8 @@
-        * change it unless you really know what you're doing
-        */
-+      DBG(4, "Some asshole called musb_charger_detect!");
-+
-       switch(musb->xceiv->state) {
-               case OTG_STATE_B_IDLE:
-                       /* we always reset transceiver */
-@@ -349,7 +351,7 @@
-       prefetch((u8 *)src);
--      DBG(4, "%cX ep%d fifo %p count %d buf %p\n",
-+      DBG_nonverb(4, "%cX ep%d fifo %p count %d buf %p\n",
-                       'T', hw_ep->epnum, fifo, len, src);
-       /* we can't assume unaligned reads work */
-@@ -387,7 +389,7 @@
- {
-       void __iomem *fifo = hw_ep->fifo;
--      DBG(4, "%cX ep%d fifo %p count %d buf %p\n",
-+      DBG_nonverb(4, "%cX ep%d fifo %p count %d buf %p\n",
-                       'R', hw_ep->epnum, fifo, len, dst);
-       /* we can't assume unaligned writes work */
-@@ -576,8 +578,8 @@
-       void __iomem *mbase = musb->mregs;
-       u8 r;
--      DBG(3, "<== Power=%02x, DevCtl=%02x, int_usb=0x%x\n", power, devctl,
--              int_usb);
-+        DBG(3, "<== State=%s Power=%02x, DevCtl=%02x, int_usb=0x%x\n",
-+                otg_state_string(musb), power, devctl, int_usb);
-       /* in host mode, the peripheral may issue remote wakeup.
-        * in peripheral mode, the host may resume the link.
-@@ -2028,12 +2030,16 @@
-       int             status;
-       mutex_lock(&musb->mutex);
--      if (sysfs_streq(buf, "host"))
--              status = musb_platform_set_mode(musb, MUSB_HOST);
-+        if (sysfs_streq(buf, "hostl"))
-+                status = musb_platform_set_mode(musb, MUSB_HOST, 0);
-+        else if (sysfs_streq(buf, "hostf"))
-+                status = musb_platform_set_mode(musb, MUSB_HOST, 1);
-+        else if (sysfs_streq(buf, "hosth"))
-+                status = musb_platform_set_mode(musb, MUSB_HOST, 2);
-       else if (sysfs_streq(buf, "peripheral"))
--              status = musb_platform_set_mode(musb, MUSB_PERIPHERAL);
-+              status = musb_platform_set_mode(musb, MUSB_PERIPHERAL, 0);
-       else if (sysfs_streq(buf, "otg"))
--              status = musb_platform_set_mode(musb, MUSB_OTG);
-+              status = musb_platform_set_mode(musb, MUSB_OTG, 0);
-       else
-               status = -EINVAL;
-       mutex_unlock(&musb->mutex);
---- kernel-power-2.6.28.orig/drivers/usb/musb/musb_core.h
-+++ kernel-power-2.6.28/drivers/usb/musb/musb_core.h
-@@ -63,6 +63,9 @@
- #include "../core/hcd.h"
- #include "musb_host.h"
-+/* This is the version of forced hostmode userspace<->kernelspace API.
-+ * Do not update to the build date, bump only on API changes */
-+#define MUSB_VERSION_HOSTMODE "20101110"
- #ifdef CONFIG_USB_MUSB_OTG
-@@ -591,7 +594,7 @@
- extern void musb_hnp_stop(struct musb *musb);
--extern int musb_platform_set_mode(struct musb *musb, u8 musb_mode);
-+extern int musb_platform_set_mode(struct musb *musb, u8 musb_mode, u8 hostspeed);
- #if defined(CONFIG_USB_TUSB6010) || defined(CONFIG_BLACKFIN) || \
-       defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX)
---- kernel-power-2.6.28.orig/drivers/usb/musb/musb_debug.h
-+++ kernel-power-2.6.28/drivers/usb/musb/musb_debug.h
-@@ -46,6 +46,21 @@
- #ifdef CONFIG_USB_MUSB_DEBUG
-+#define xprintk_verb(level, facility, format, args...) do { \
-+        if (_dbg_level(level)) { \
-+                        u8 testmode, devctl, power/*, otg_ctrl, func_ctrl, isp_debug*/; \
-+                        testmode = musb_readb(musb->mregs, MUSB_TESTMODE); \
-+                        devctl = musb_readb(musb->mregs, MUSB_DEVCTL); \
-+                        power = musb_readb(musb->mregs, MUSB_POWER); \
-+                        /*otg_ctrl = musb_ulpi_readb(musb->mregs, ISP1704_OTG_CTRL); \
-+                        func_ctrl = musb_ulpi_readb(musb->mregs, ISP1704_FUNC_CTRL); \
-+                        isp_debug = musb_ulpi_readb(musb->mregs, ISP1704_DEBUG); */ \
-+                        printk(facility "State=%s Testmode=%02x Power=%02x, DevCtl=%02x\n", \
-+                                otg_state_string(musb), testmode, power, devctl/*, otg_ctrl, func_ctrl, isp_debug*/); \
-+                        printk(facility "%-20s %4d: " format , \
-+                                __func__, __LINE__ , ## args); \
-+        } } while (0)
-+
- #define xprintk(level, facility, format, args...) do { \
-       if (_dbg_level(level)) { \
-               printk(facility "%-20s %4d: " format , \
-@@ -58,7 +73,8 @@
- {
-       return musb_debug >= l;
- }
--#define DBG(level, fmt, args...) xprintk(level, KERN_DEBUG, fmt, ## args)
-+#define DBG(level, fmt, args...) xprintk_verb(level, KERN_DEBUG, fmt, ## args)
-+#define DBG_nonverb(level, fmt, args...) xprintk(level, KERN_DEBUG, fmt, ## args)
- #else
- #define DBG(level, fmt, args...)      do {} while(0)
- #endif        /* CONFIG_USB_MUSB_DEBUG */
---- kernel-power-2.6.28.orig/drivers/usb/musb/musb_gadget.c
-+++ kernel-power-2.6.28/drivers/usb/musb/musb_gadget.c
-@@ -816,12 +816,12 @@
-       if (!ep || !desc)
-               return -EINVAL;
-+        musb_ep = to_musb_ep(ep);
-+        musb = musb_ep->musb;
-       DBG(1, "===> enabling %s\n", ep->name);
--      musb_ep = to_musb_ep(ep);
-       hw_ep = musb_ep->hw_ep;
-       regs = hw_ep->regs;
--      musb = musb_ep->musb;
-       mbase = musb->mregs;
-       epnum = musb_ep->current_epnum;
-@@ -949,8 +949,8 @@
-       int             status = 0;
-       musb_ep = to_musb_ep(ep);
--      DBG(4, "disabling %s\n", musb_ep->name);
-       musb = musb_ep->musb;
-+      DBG(4, "disabling %s\n", musb_ep->name);
-       epnum = musb_ep->current_epnum;
-       epio = musb->endpoints[epnum].regs;
---- kernel-power-2.6.28.orig/drivers/usb/musb/musb_host.c
-+++ kernel-power-2.6.28/drivers/usb/musb/musb_host.c
-@@ -118,7 +118,7 @@
-       csr = musb_readw(epio, MUSB_TXCSR);
-       while (csr & MUSB_TXCSR_FIFONOTEMPTY) {
-               if (csr != lastcsr)
--                      DBG(3, "Host TX FIFONOTEMPTY csr: %02x\n", csr);
-+                      DBG_nonverb(3, "Host TX FIFONOTEMPTY csr: %02x\n", csr);
-               lastcsr = csr;
-               csr |= MUSB_TXCSR_FLUSHFIFO;
-               musb_writew(epio, MUSB_TXCSR, csr);
-@@ -2036,7 +2036,7 @@
-               dma = is_in ? ep->rx_channel : ep->tx_channel;
-               if (dma) {
-                       status = ep->musb->dma_controller->channel_abort(dma);
--                      DBG(status ? 1 : 3,
-+                      DBG_nonverb(status ? 1 : 3,
-                               "abort %cX%d DMA for urb %p --> %d\n",
-                               is_in ? 'R' : 'T', ep->epnum,
-                               urb, status);
---- kernel-power-2.6.28.orig/drivers/usb/musb/musb_procfs.c
-+++ kernel-power-2.6.28/drivers/usb/musb/musb_procfs.c
-@@ -479,7 +479,8 @@
- #elif defined(CONFIG_USB_MUSB_HDRC_HCD)
-                       "host"
- #endif
--                      ", debug=%d [eps=%d]\n",
-+                      ", debug=%d [eps=%d]"
-+                      ", version_hostmode=" MUSB_VERSION_HOSTMODE "\n",
-               musb_debug,
-               musb->nr_endpoints);
-       if (code <= 0)
-@@ -651,6 +652,75 @@
-               reg = musb_readb(mbase, MUSB_DEVCTL);
-               reg |= MUSB_DEVCTL_SESSION;
-               musb_writeb(mbase, MUSB_DEVCTL, reg);
-+
-+              /* Pretend there's a session request */
-+              musb->ep0_stage = MUSB_EP0_START;
-+              musb->xceiv->state = OTG_STATE_A_IDLE;
-+              MUSB_HST_MODE(musb);
-+              musb_set_vbus(musb, 1);
-+
-+              /* Connect request */
-+              {
-+              struct usb_hcd *hcd = musb_to_hcd(musb);
-+              u8 testmode, line;
-+
-+              musb->is_active = 1;
-+              set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
-+
-+              musb->ep0_stage = MUSB_EP0_START;
-+
-+#ifdef CONFIG_USB_MUSB_OTG
-+              /* flush endpoints when transitioning from Device Mode */
-+              if (is_peripheral_active(musb)) {
-+                      /* REVISIT HNP; just force disconnect */
-+              }
-+              musb_writew(mbase, MUSB_INTRTXE, musb->epmask);
-+              musb_writew(mbase, MUSB_INTRRXE, musb->epmask & 0xfffe);
-+              musb_writeb(mbase, MUSB_INTRUSBE, 0xf7);
-+#endif
-+              musb->port1_status &= ~(USB_PORT_STAT_LOW_SPEED
-+                                      |USB_PORT_STAT_HIGH_SPEED
-+                                      |USB_PORT_STAT_ENABLE
-+                                      );
-+              musb->port1_status |= USB_PORT_STAT_CONNECTION
-+                                      |(USB_PORT_STAT_C_CONNECTION << 16);
-+
-+              line = musb_ulpi_readb(mbase, ISP1704_DEBUG);
-+              testmode = musb_readb(mbase, MUSB_TESTMODE);
-+
-+              switch (line) {
-+              case 1: /* pullup indicates a full/high-speed device */
-+                      if (!(testmode & (MUSB_TEST_FORCE_FS | MUSB_TEST_FORCE_HS)))
-+                              pr_err("Forced hostmode error: a full/high-speed device attached but low-speed mode selected\n"); 
-+                      break;
-+              case 2: /* pullup indicates a low-speed device */
-+                      if (testmode & (MUSB_TEST_FORCE_FS | MUSB_TEST_FORCE_HS))
-+                              pr_err("Forced hostmode error: a low-speed device attached but full/high-speed mode selected\n"); 
-+                      break;
-+              default:
-+                      pr_err("Forced hostmode error: no device attached\n");
-+              }
-+ 
-+              if (!(testmode & (MUSB_TEST_FORCE_FS | MUSB_TEST_FORCE_HS)))
-+                      musb->port1_status |= USB_PORT_STAT_LOW_SPEED;
-+
-+              if (hcd->status_urb)
-+                      usb_hcd_poll_rh_status(hcd);
-+              else
-+                      usb_hcd_resume_root_hub(hcd);
-+
-+              MUSB_HST_MODE(musb);
-+
-+              /* indicate new connection to OTG machine */
-+              switch (musb->xceiv->state) {
-+              default:
-+                              musb->xceiv->state = OTG_STATE_A_HOST;
-+                              hcd->self.is_b_host = 0;
-+                      break;
-+              }
-+              DBG(1, "CONNECT (%s) devctl %02x\n",
-+                              otg_state_string(musb), devctl);
-+              }
-               break;
-       case 'H':
---- kernel-power-2.6.28.orig/drivers/usb/musb/musb_regs.h
-+++ kernel-power-2.6.28/drivers/usb/musb/musb_regs.h
-@@ -330,7 +330,7 @@
-       while (!(musb_readb(addr, ULPI_REG_CONTROL) & ULPI_REG_CMPLT)) {
-               i++;
-               if (i == 10000) {
--                      DBG(3, "ULPI read timed out\n");
-+                      DBG_nonverb(3, "ULPI read timed out\n");
-                       return 0;
-               }
-@@ -355,7 +355,7 @@
-       while(!(musb_readb(addr, ULPI_REG_CONTROL) & ULPI_REG_CMPLT)) {
-               i++;
-               if (i == 10000) {
--                      DBG(3, "ULPI write timed out\n");
-+                      DBG_nonverb(3, "ULPI write timed out\n");
-                       return;
-               }
-       }
---- kernel-power-2.6.28.orig/drivers/usb/musb/musbhsdma.c
-+++ kernel-power-2.6.28/drivers/usb/musb/musbhsdma.c
-@@ -131,7 +131,7 @@
-       u8 bchannel = musb_channel->idx;
-       u16 csr = 0;
--      DBG(4, "%p, pkt_sz %d, addr 0x%x, len %d, mode %d\n",
-+      DBG_nonverb(4, "%p, pkt_sz %d, addr 0x%x, len %d, mode %d\n",
-                       channel, packet_sz, dma_addr, len, mode);
-       if (mode)
-@@ -167,7 +167,7 @@
- {
-       struct musb_dma_channel *musb_channel = channel->private_data;
--      DBG(2, "ep%d-%s pkt_sz %d, dma_addr 0x%x length %d, mode %d\n",
-+      DBG_nonverb(2, "ep%d-%s pkt_sz %d, dma_addr 0x%x length %d, mode %d\n",
-               musb_channel->epnum,
-               musb_channel->transmit ? "Tx" : "Rx",
-               packet_sz, dma_addr, len, mode);
---- kernel-power-2.6.28.orig/drivers/usb/musb/omap2430.c
-+++ kernel-power-2.6.28/drivers/usb/musb/omap2430.c
-@@ -73,6 +73,8 @@
-       spin_lock_irqsave(&musb->lock, flags);
-+      DBG(3, "%s\n", otg_state_string(musb));
-+
-       devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
-       switch (musb->xceiv->state) {
-@@ -211,15 +213,12 @@
- static int musb_platform_resume(struct musb *musb);
--int musb_platform_set_mode(struct musb *musb, u8 musb_mode)
-+int musb_platform_set_mode(struct musb *musb, u8 musb_mode, u8 hostspeed)
- {
-       struct usb_hcd  *hcd;
-       struct usb_bus  *host;
-       u8              devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
--      devctl |= MUSB_DEVCTL_SESSION;
--      musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
--
-       switch (musb_mode) {
- #ifdef CONFIG_USB_MUSB_HDRC_HCD
-       case MUSB_HOST:
-@@ -227,10 +226,36 @@
-               host = hcd_to_bus(hcd);
-               otg_set_host(musb->xceiv, host);
-+ 
-+                if (machine_is_nokia_rx51()) {
-+                        u8 testmode;
-+ 
-+                        musb_platform_resume(musb);
-+ 
-+                        devctl |= MUSB_DEVCTL_SESSION;
-+                        musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
-+ 
-+                        testmode = MUSB_TEST_FORCE_HOST;
-+                        if (hostspeed == 1)
-+                                testmode |= MUSB_TEST_FORCE_FS;
-+                        else if (hostspeed == 2)
-+                                testmode |= MUSB_TEST_FORCE_HS;
-+                        musb_writeb(musb->mregs, MUSB_TESTMODE, testmode);
-+                }
-               break;
- #endif
- #ifdef CONFIG_USB_GADGET_MUSB_HDRC
-       case MUSB_PERIPHERAL:
-+                if (machine_is_nokia_rx51()) {
-+                        musb_platform_resume(musb);
-+                        musb_set_vbus(musb, 0);
-+ 
-+                        devctl &= ~MUSB_DEVCTL_SESSION;
-+                        musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
-+ 
-+                        musb_writeb(musb->mregs, MUSB_TESTMODE, 0);
-+                }
-+ 
-               otg_set_peripheral(musb->xceiv, &musb->g);
-               break;
- #endif
---- kernel-power-2.6.28.orig/drivers/usb/otg/twl4030-usb.c
-+++ kernel-power-2.6.28/drivers/usb/otg/twl4030-usb.c
-@@ -371,6 +371,7 @@
-       spin_lock_irq(&twl->lock);
-       twl->linkstat = linkstat;
-+#if 0
-       if (linkstat == USB_LINK_ID) {
-               twl->otg.default_a = true;
-               twl->otg.state = OTG_STATE_A_IDLE;
-@@ -378,6 +379,7 @@
-               twl->otg.default_a = false;
-               twl->otg.state = OTG_STATE_B_IDLE;
-       }
-+#endif
-       spin_unlock_irq(&twl->lock);
-       return linkstat;
---- kernel-power-2.6.28.orig/drivers/usb/musb/musb_virthub.c
-+++ kernel-power-2.6.28/drivers/usb/musb/musb_virthub.c
-@@ -112,7 +112,7 @@
- static void musb_port_reset(struct musb *musb, bool do_reset)
- {
--      u8              power;
-+      u8              power, testmode;
-       void __iomem    *mbase = musb->mregs;
- #ifdef CONFIG_USB_MUSB_OTG
-@@ -162,10 +162,16 @@
-               musb->ignore_disconnect = false;
-+              testmode = musb_readb(mbase, MUSB_TESTMODE);
-               power = musb_readb(mbase, MUSB_POWER);
-               if (power & MUSB_POWER_HSMODE) {
-                       DBG(4, "high-speed device connected\n");
-                       musb->port1_status |= USB_PORT_STAT_HIGH_SPEED;
-+                      if (!(testmode & MUSB_TEST_FORCE_HS))
-+                              pr_err("Forced hostmode error: a high-speed device attached but not high-speed mode selected\n"); 
-+              } else {
-+                      if (testmode & MUSB_TEST_FORCE_HS)
-+                              pr_err("Forced hostmode error: a full/low-speed device attached but high-speed mode selected\n"); 
-               }
-               musb->port1_status &= ~USB_PORT_STAT_RESET;
diff --git a/kernel-power-2.6.28/debian/patches/usbwhitelist.diff b/kernel-power-2.6.28/debian/patches/usbwhitelist.diff
deleted file mode 100644 (file)
index 1022261..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- kernel-power-2.6.28.orig/drivers/usb/core/otg_whitelist.h
-+++ kernel-power-2.6.28/drivers/usb/core/otg_whitelist.h
-@@ -14,7 +14,7 @@
- #else
- static inline int is_targeted(struct usb_device *d)
- {
--      return 0;
-+      return 1;
- }
- #endif