← Back to branch summary

~ubuntu-branches/ubuntu/saucy/u-boot/saucy

« back to all changes in this revision

Viewing changes to drivers/usb/host/isp116x-hcd.c

  • Committer: Package Import Robot
  • Author(s): Clint Adams
  • Date: 2012-05-01 18:07:19 UTC
  • mfrom: (16.1.23 sid)
  • Revision ID: package-import@ubuntu.com-20120501180719-rjntk3287im4a0ns
Tags: 2012.04.01-1
* New upstream version.
  - Update mipsel-native-endianness.diff.
  - Update no-error-on-set-but-unused-variables.diff (partially merged).
  - Drop kirkwood_spi-irq_mask.diff (merged).
  - Drop kirkwood-disable-l2c.diff (merged).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/host/isp116x-hcd.c
578
578
                        /* When root hub or any of its ports is going
579
579
                           to come out of suspend, it may take more
580
580
                           than 10ms for status bits to stabilize. */
581
 
                        wait_ms(20);
 
581
                        mdelay(20);
582
582
                }
583
583
 
584
584
                if (intstat & HCINT_SO) {
679
679
        /* Pack data into FIFO ram */
680
680
        pack_fifo(isp116x, dev, pipe, ptd, 1, buffer, len);
681
681
#ifdef EXTRA_DELAY
682
 
        wait_ms(EXTRA_DELAY);
 
682
        mdelay(EXTRA_DELAY);
683
683
#endif
684
684
 
685
685
        /* Start the data transfer */
983
983
                                                       HCRHPORT1 + wIndex - 1);
984
984
                                if (!(tmp & RH_PS_PRS))
985
985
                                        break;
986
 
                                wait_ms(1);
 
986
                                mdelay(1);
987
987
                        }
988
988
                        isp116x_write_reg32(isp116x, HCRHPORT1 + wIndex - 1,
989
989
                                            RH_PS_PRS);
990
 
                        wait_ms(10);
 
990
                        mdelay(10);
991
991
 
992
992
                        len = 0;
993
993
                        break;
1251
1251
        isp116x_write_reg32(isp116x, HCCMDSTAT, HCCMDSTAT_HCR);
1252
1252
        while (--retries) {
1253
1253
                /* It usually resets within 1 ms */
1254
 
                wait_ms(1);
 
1254
                mdelay(1);
1255
1255
                if (!(isp116x_read_reg32(isp116x, HCCMDSTAT) & HCCMDSTAT_HCR))
1256
1256
                        break;
1257
1257
        }
1278
1278
                clkrdy = isp116x_read_reg16(isp116x, HCuPINT) & HCuPINT_CLKRDY;
1279
1279
                if (clkrdy)
1280
1280
                        break;
1281
 
                wait_ms(1);
 
1281
                mdelay(1);
1282
1282
        }
1283
1283
        if (!clkrdy) {
1284
1284
                ERR("clock not ready after %dms", timeout);