From cd79b13b1356149e4bfe743e1d4d54cd919f6861 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 11 Jun 2013 21:09:31 +0200 Subject: [PATCH] usb: ehci: Fixup efika hack for devicetree We used to distinguish which USB port to fixup by pdev->id. This is < 0 for devicetree probed devices all the time, so this won't work anymore once we switch to devicetree. Do the fixup on every port instead, it doesn't hurt. Signed-off-by: Sascha Hauer --- drivers/usb/host/ehci-hcd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 7c389aac8..161785a8b 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -443,9 +443,8 @@ void ehci_powerup_fixup(struct ehci_priv *ehci) { void *viewport = (void *)ehci->hcor + 0x30; - if (ehci->dev->id > 0) - ulpi_write(ULPI_OTG_CHRG_VBUS, ULPI_OTGCTL + ULPI_REG_SET, - viewport); + ulpi_write(ULPI_OTG_CHRG_VBUS, ULPI_OTGCTL + ULPI_REG_SET, + viewport); } #else static inline void ehci_powerup_fixup(struct ehci_priv *ehci)