USB: ohci: make distrust_firmware a quirk
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Cc: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
f0fa74634c
commit
1133cd8adf
|
@ -483,6 +483,9 @@ static int ohci_init (struct ohci_hcd *ohci)
|
||||||
int ret;
|
int ret;
|
||||||
struct usb_hcd *hcd = ohci_to_hcd(ohci);
|
struct usb_hcd *hcd = ohci_to_hcd(ohci);
|
||||||
|
|
||||||
|
if (distrust_firmware)
|
||||||
|
ohci->flags |= OHCI_QUIRK_HUB_POWER;
|
||||||
|
|
||||||
disable (ohci);
|
disable (ohci);
|
||||||
ohci->regs = hcd->regs;
|
ohci->regs = hcd->regs;
|
||||||
|
|
||||||
|
@ -689,7 +692,8 @@ retry:
|
||||||
temp |= RH_A_NOCP;
|
temp |= RH_A_NOCP;
|
||||||
temp &= ~(RH_A_POTPGT | RH_A_NPS);
|
temp &= ~(RH_A_POTPGT | RH_A_NPS);
|
||||||
ohci_writel (ohci, temp, &ohci->regs->roothub.a);
|
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
|
/* hub power always on; required for AMD-756 and some
|
||||||
* Mac platforms. ganged overcurrent reporting, if any.
|
* Mac platforms. ganged overcurrent reporting, if any.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -260,7 +260,7 @@ static int ohci_omap_init(struct usb_hcd *hcd)
|
||||||
omap_cfg_reg(W4_USB_HIGHZ);
|
omap_cfg_reg(W4_USB_HIGHZ);
|
||||||
}
|
}
|
||||||
ohci_writel(ohci, rh, &ohci->regs->roothub.a);
|
ohci_writel(ohci, rh, &ohci->regs->roothub.a);
|
||||||
distrust_firmware = 0;
|
ohci->flags &= ~OHCI_QUIRK_HUB_POWER;
|
||||||
} else if (machine_is_nokia770()) {
|
} else if (machine_is_nokia770()) {
|
||||||
/* We require a self-powered hub, which should have
|
/* We require a self-powered hub, which should have
|
||||||
* plenty of power. */
|
* plenty of power. */
|
||||||
|
|
|
@ -399,6 +399,7 @@ struct ohci_hcd {
|
||||||
#define OHCI_QUIRK_ZFMICRO 0x20 /* Compaq ZFMicro chipset*/
|
#define OHCI_QUIRK_ZFMICRO 0x20 /* Compaq ZFMicro chipset*/
|
||||||
#define OHCI_QUIRK_NEC 0x40 /* lost interrupts */
|
#define OHCI_QUIRK_NEC 0x40 /* lost interrupts */
|
||||||
#define OHCI_QUIRK_FRAME_NO 0x80 /* no big endian frame_no shift */
|
#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
|
// there are also chip quirks/bugs in init logic
|
||||||
|
|
||||||
struct work_struct nec_work; /* Worker for NEC quirk */
|
struct work_struct nec_work; /* Worker for NEC quirk */
|
||||||
|
|
Loading…
Reference in a new issue