Commit 1133cd8a authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Greg Kroah-Hartman
Browse files

USB: ohci: make distrust_firmware a quirk 



Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f0fa7463

drivers/usb/host/ohci-hcd.c

+5 −1
Original line number Diff line number Diff line
@@ -483,6 +483,9 @@ static int ohci_init (struct ohci_hcd *ohci) 
	int ret;

	struct usb_hcd *hcd = ohci_to_hcd(ohci);



	if (distrust_firmware)

		ohci->flags |= OHCI_QUIRK_HUB_POWER;



	disable (ohci);

	ohci->regs = hcd->regs;
@@ -689,7 +692,8 @@ static int ohci_run (struct ohci_hcd *ohci) 
		temp |= RH_A_NOCP;

		temp &= ~(RH_A_POTPGT | RH_A_NPS);

		ohci_writel (ohci, temp, &ohci->regs->roothub.a);

	} else if ((ohci->flags & OHCI_QUIRK_AMD756) || distrust_firmware) {

	} else if ((ohci->flags & OHCI_QUIRK_AMD756) ||

			(ohci->flags & OHCI_QUIRK_HUB_POWER)) {

		/* hub power always on; required for AMD-756 and some

		 * Mac platforms.  ganged overcurrent reporting, if any.

		 */

drivers/usb/host/ohci-omap.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static int ohci_omap_init(struct usb_hcd *hcd) 
			omap_cfg_reg(W4_USB_HIGHZ);

		}

		ohci_writel(ohci, rh, &ohci->regs->roothub.a);

		distrust_firmware = 0;

		ohci->flags &= ~OHCI_QUIRK_HUB_POWER;

	} else if (machine_is_nokia770()) {

		/* We require a self-powered hub, which should have

		 * plenty of power. */

drivers/usb/host/ohci.h

+1 −0
Original line number Diff line number Diff line
@@ -399,6 +399,7 @@ struct ohci_hcd { 
#define	OHCI_QUIRK_ZFMICRO	0x20			/* Compaq ZFMicro chipset*/

#define	OHCI_QUIRK_NEC		0x40			/* lost interrupts */

#define	OHCI_QUIRK_FRAME_NO	0x80			/* no big endian frame_no shift */

#define	OHCI_QUIRK_HUB_POWER	0x100			/* distrust firmware power/oc setup */

	// there are also chip quirks/bugs in init logic



	struct work_struct	nec_work;	/* Worker for NEC quirk */