diff options
Diffstat (limited to 'drivers/usb/host/ehci.h')
-rw-r--r-- | drivers/usb/host/ehci.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 556c0b48f3ab..650a687f2854 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h | |||
@@ -536,6 +536,16 @@ struct ehci_fstn { | |||
536 | 536 | ||
537 | /*-------------------------------------------------------------------------*/ | 537 | /*-------------------------------------------------------------------------*/ |
538 | 538 | ||
539 | /* Prepare the PORTSC wakeup flags during controller suspend/resume */ | ||
540 | |||
541 | #define ehci_prepare_ports_for_controller_suspend(ehci) \ | ||
542 | ehci_adjust_port_wakeup_flags(ehci, true); | ||
543 | |||
544 | #define ehci_prepare_ports_for_controller_resume(ehci) \ | ||
545 | ehci_adjust_port_wakeup_flags(ehci, false); | ||
546 | |||
547 | /*-------------------------------------------------------------------------*/ | ||
548 | |||
539 | #ifdef CONFIG_USB_EHCI_ROOT_HUB_TT | 549 | #ifdef CONFIG_USB_EHCI_ROOT_HUB_TT |
540 | 550 | ||
541 | /* | 551 | /* |
@@ -556,20 +566,20 @@ ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc) | |||
556 | case 0: | 566 | case 0: |
557 | return 0; | 567 | return 0; |
558 | case 1: | 568 | case 1: |
559 | return (1<<USB_PORT_FEAT_LOWSPEED); | 569 | return USB_PORT_STAT_LOW_SPEED; |
560 | case 2: | 570 | case 2: |
561 | default: | 571 | default: |
562 | return (1<<USB_PORT_FEAT_HIGHSPEED); | 572 | return USB_PORT_STAT_HIGH_SPEED; |
563 | } | 573 | } |
564 | } | 574 | } |
565 | return (1<<USB_PORT_FEAT_HIGHSPEED); | 575 | return USB_PORT_STAT_HIGH_SPEED; |
566 | } | 576 | } |
567 | 577 | ||
568 | #else | 578 | #else |
569 | 579 | ||
570 | #define ehci_is_TDI(e) (0) | 580 | #define ehci_is_TDI(e) (0) |
571 | 581 | ||
572 | #define ehci_port_speed(ehci, portsc) (1<<USB_PORT_FEAT_HIGHSPEED) | 582 | #define ehci_port_speed(ehci, portsc) USB_PORT_STAT_HIGH_SPEED |
573 | #endif | 583 | #endif |
574 | 584 | ||
575 | /*-------------------------------------------------------------------------*/ | 585 | /*-------------------------------------------------------------------------*/ |