usb: gadget: omap_udc: fix USB gadget regression on Palm TE

aakoskin · gregkh · commit 858a74cb5128 · 2024-02-19T09:30:42.000+01:00
When upgrading from 6.1 LTS to 6.6 LTS, I noticed the ethernet gadget stopped working on Palm TE. Commit 8825acd ("ARM: omap1: remove dead code") deleted Palm TE from machine_without_vbus_sense(), although the board is still used. Fix that. Fixes: 8825acd ("ARM: omap1: remove dead code") Cc: stable <stable@kernel.org> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Acked-by: Arnd Bergmann <arnd@arndb.de> Link: https://lore.kernel.org/r/20240217192042.GA372205@darkstar.musicnaut.iki.fi Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c
@@ -2036,7 +2036,8 @@ static irqreturn_t omap_udc_iso_irq(int irq, void *_dev)
 
 static inline int machine_without_vbus_sense(void)
 {
-	return  machine_is_omap_osk() || machine_is_sx1();
+	return  machine_is_omap_osk() || machine_is_omap_palmte() ||
+		machine_is_sx1();
 }
 
 static int omap_udc_start(struct usb_gadget *g,

Original file line number	Diff line number	Diff line change
`@@ -2036,7 +2036,8 @@ static irqreturn_t omap_udc_iso_irq(int irq, void *_dev)`
`2036`	`2036`
`2037`	`2037`	`static inline int machine_without_vbus_sense(void)`
`2038`	`2038`	`{`
`2039`		`- return machine_is_omap_osk() \|\| machine_is_sx1();`
	`2039`	`+ return machine_is_omap_osk() \|\| machine_is_omap_palmte() \|\|`
	`2040`	`+ machine_is_sx1();`
`2040`	`2041`	`}`
`2041`	`2042`
`2042`	`2043`	`static int omap_udc_start(struct usb_gadget *g,`