summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2024-02-17 21:20:42 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-02-19 09:30:42 +0100
commit858a74cb512833e276d96a72acb560ce8c138bec (patch)
treebd9d3885af5bf775ff5a9fbb38477315ecf750bf
parentb191a18cb5c47109ca696370a74a5062a70adfd0 (diff)
downloadlinux-stable-858a74cb512833e276d96a72acb560ce8c138bec.tar.gz
linux-stable-858a74cb512833e276d96a72acb560ce8c138bec.tar.bz2
linux-stable-858a74cb512833e276d96a72acb560ce8c138bec.zip
usb: gadget: omap_udc: fix USB gadget regression on Palm TE
When upgrading from 6.1 LTS to 6.6 LTS, I noticed the ethernet gadget stopped working on Palm TE. Commit 8825acd7cc8a ("ARM: omap1: remove dead code") deleted Palm TE from machine_without_vbus_sense(), although the board is still used. Fix that. Fixes: 8825acd7cc8a ("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>
-rw-r--r--drivers/usb/gadget/udc/omap_udc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c
index 10c5d7f726a1..f90eeecf27de 100644
--- 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,