Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed19ece1 authored by Wenyou Yang's avatar Wenyou Yang Committed by Greg Kroah-Hartman
Browse files

usb: ohci-at91: Set RemoteWakeupConnected bit explicitly. 



The reset value of RWC is 0, set RemoteWakeupConnected bit explicitly
before calling ohci_run, it also fixes the issue that the mass
storage stick connected wasn't suspended when the system suspend.

Signed-off-by: default avatarWenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 36de70ea

drivers/usb/host/ohci-at91.c

+6 −3
Original line number Diff line number Diff line
@@ -221,6 +221,12 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver, 
	ohci->num_ports = board->ports;

	at91_start_hc(pdev);



	/*

	 * The RemoteWakeupConnected bit has to be set explicitly

	 * before calling ohci_run. The reset value of this bit is 0.

	 */

	ohci->hc_control = OHCI_CTRL_RWC;



	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);

	if (retval == 0) {

		device_wakeup_enable(hcd->self.controller);
@@ -677,9 +683,6 @@ ohci_hcd_at91_drv_suspend(struct device *dev) 
	 * REVISIT: some boards will be able to turn VBUS off...

	 */

	if (!ohci_at91->wakeup) {

		ohci->hc_control = ohci_readl(ohci, &ohci->regs->control);

		ohci->hc_control &= OHCI_CTRL_RWC;

		ohci_writel(ohci, ohci->hc_control, &ohci->regs->control);

		ohci->rh_state = OHCI_RH_HALTED;



		/* flush the writes */