usb: ohci-omap: Fix descriptor conversion

There were a bunch of issues with the patch converting the
OMAP1 OSK board to use descriptors for controlling the USB
host:

- The chip label was incorrect
- The GPIO offset was off-by-one
- The code should use sleeping accessors

This patch tries to fix all issues at the same time.

Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Fixes: 15d157e87443 ("usb: ohci-omap: Convert to use GPIO descriptors")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20201130083033.29435-1-linus.walleij@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by Linus Walleij and committed by Greg Kroah-Hartman 45c57754 97ad4a77

Changed files
+3 -3
arch
arm
mach-omap1
drivers
usb
+1 -1
arch/arm/mach-omap1/board-osk.c
··· 288 288 .dev_id = "ohci", 289 289 .table = { 290 290 /* Power GPIO on the I2C-attached TPS65010 */ 291 - GPIO_LOOKUP("i2c-tps65010", 1, "power", GPIO_ACTIVE_HIGH), 291 + GPIO_LOOKUP("tps65010", 0, "power", GPIO_ACTIVE_HIGH), 292 292 GPIO_LOOKUP(OMAP_GPIO_LABEL, 9, "overcurrent", 293 293 GPIO_ACTIVE_HIGH), 294 294 },
+2 -2
drivers/usb/host/ohci-omap.c
··· 91 91 | ((1 << 5/*usb1*/) | (1 << 3/*usb2*/)), 92 92 INNOVATOR_FPGA_CAM_USB_CONTROL); 93 93 else if (priv->power) 94 - gpiod_set_value(priv->power, 0); 94 + gpiod_set_value_cansleep(priv->power, 0); 95 95 } else { 96 96 if (machine_is_omap_innovator() && cpu_is_omap1510()) 97 97 __raw_writeb(__raw_readb(INNOVATOR_FPGA_CAM_USB_CONTROL) 98 98 & ~((1 << 5/*usb1*/) | (1 << 3/*usb2*/)), 99 99 INNOVATOR_FPGA_CAM_USB_CONTROL); 100 100 else if (priv->power) 101 - gpiod_set_value(priv->power, 1); 101 + gpiod_set_value_cansleep(priv->power, 1); 102 102 } 103 103 104 104 return 0;