[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20201214210121.22042-1-aaro.koskinen@iki.fi>
Date: Mon, 14 Dec 2020 23:01:21 +0200
From: Aaro Koskinen <aaro.koskinen@....fi>
To: Tony Lindgren <tony@...mide.com>,
Linus Walleij <linus.walleij@...aro.org>,
linux-omap@...r.kernel.org, linux-arm-kernel@...ts.infradead.org
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] ARM: OMAP1: OSK: fix ohci-omap breakage
From: Linus Walleij <linus.walleij@...aro.org>
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@...aro.org>
[aaro.koskinen@....fi: rebased and updated the changelog]
Signed-off-by: Aaro Koskinen <aaro.koskinen@....fi>
---
This is the patch that should have been merged:
https://marc.info/?l=linux-usb&m=160682513710441&w=2
arch/arm/mach-omap1/board-osk.c | 2 ++
1 file changed, 2 insertions(+)
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);
--
2.17.0
Powered by blists - more mailing lists