diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2020-12-14 23:01:21 +0200 |
|---|---|---|
| committer |   Tony Lindgren <tony@atomide.com> | 2020-12-18 09:12:12 +0200 |
| commit | 6efac0173cd15460b48c91e1b0a000379f341f00 (patch) | |
| tree | c72bac3945064aca19ad8270b0f868a9d7ff78f6 /arch/arm/mach-omap1 | |
| parent | DTS: ARM: gta04: remove legacy spi-cs-high to make display work again (diff) | |
| download | linux-dev-6efac0173cd15460b48c91e1b0a000379f341f00.tar.xz linux-dev-6efac0173cd15460b48c91e1b0a000379f341f00.zip | |
ARM: OMAP1: OSK: fix ohci-omap breakage
Commit 45c5775460f3 ("usb: ohci-omap: Fix descriptor conversion") tried to
fix all issues related to ohci-omap descriptor conversion, but a wrong
patch was applied, and one needed change to the OSK board file is still
missing. Fix that.
Fixes: 45c5775460f3 ("usb: ohci-omap: Fix descriptor conversion")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[aaro.koskinen@iki.fi: rebased and updated the changelog]
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index a720259099ed..0a4c9b0b13b0 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -203,6 +203,8 @@ static int osk_tps_setup(struct i2c_client *client, void *context) */ gpio_request(OSK_TPS_GPIO_USB_PWR_EN, "n_vbus_en"); gpio_direction_output(OSK_TPS_GPIO_USB_PWR_EN, 1); + /* Free the GPIO again as the driver will request it */ + gpio_free(OSK_TPS_GPIO_USB_PWR_EN); /* Set GPIO 2 high so LED D3 is off by default */ tps65010_set_gpio_out_value(GPIO2, HIGH); |