diff mbox series

ARM: OMAP1: OSK: fix ohci-omap breakage

Message ID 20201214210121.22042-1-aaro.koskinen@iki.fi (mailing list archive)
State New
Headers show
Series ARM: OMAP1: OSK: fix ohci-omap breakage | expand

Commit Message

Aaro Koskinen Dec. 14, 2020, 9:01 p.m. UTC
From: Linus Walleij <linus.walleij@linaro.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@linaro.org>
[aaro.koskinen@iki.fi: rebased and updated the changelog]
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.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(+)

Comments

Tony Lindgren Dec. 18, 2020, 7:14 a.m. UTC | #1
* Aaro Koskinen <aaro.koskinen@iki.fi> [201214 23:01]:
> From: Linus Walleij <linus.walleij@linaro.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.

Thanks applying into fixes.

Tony
Linus Walleij Dec. 18, 2020, 4:21 p.m. UTC | #2
On Mon, Dec 14, 2020 at 10:01 PM Aaro Koskinen <aaro.koskinen@iki.fi> wrote:

> From: Linus Walleij <linus.walleij@linaro.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@linaro.org>
> [aaro.koskinen@iki.fi: rebased and updated the changelog]
> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Thanks for sweeping up the mistakes, much appreciated!

I am vaguely feeling it might be lower effort for me to convert
the OSK board to device tree than fixing all GPIO consumers
one by one, but I don't think I could procure the hardware :P

Yours,
Linus Walleij
diff mbox series

Patch

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);