← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/sparc/cpu/leon3/usb_uhci.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:
arch/sparc/cpu/leon3/usb_uhci.c
515
515
        out16r(usb_base_addr + USBCMD, USBCMD_GRESET | USBCMD_RS);
516
516
        /* Turn off all interrupts */
517
517
        out16r(usb_base_addr + USBINTR, 0);
518
 
        wait_ms(50);
 
518
        mdelay(50);
519
519
        out16r(usb_base_addr + USBCMD, 0);
520
 
        wait_ms(10);
 
520
        mdelay(10);
521
521
}
522
522
 
523
523
void start_hc(void)
1044
1044
                        status = (status & 0xfff5) | USBPORTSC_PR;
1045
1045
                        out16r(usb_base_addr + USBPORTSC1 + 2 * (wIndex - 1),
1046
1046
                               status);
1047
 
                        wait_ms(10);
 
1047
                        mdelay(10);
1048
1048
                        status = (status & 0xfff5) & ~USBPORTSC_PR;
1049
1049
                        out16r(usb_base_addr + USBPORTSC1 + 2 * (wIndex - 1),
1050
1050
                               status);
1052
1052
                        status = (status & 0xfff5) | USBPORTSC_PE;
1053
1053
                        out16r(usb_base_addr + USBPORTSC1 + 2 * (wIndex - 1),
1054
1054
                               status);
1055
 
                        wait_ms(10);
 
1055
                        mdelay(10);
1056
1056
                        status = (status & 0xfff5) | 0xa;
1057
1057
                        out16r(usb_base_addr + USBPORTSC1 + 2 * (wIndex - 1),
1058
1058
                               status);