From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C2A9178B61; Tue, 27 Feb 2024 13:39:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709041181; cv=none; b=dTJJKnyyc0eZXpDZXAChqgQoEbrs5UVBZpWWo31oj8Alr9pH3ss+DURPGGzw4M3cba8djzcvlua2Gmeg8gnEp2zMl6fHsDH53/2x/eQXhzPbjRjs3AM2goqOkA/KmVitGMo2/N8iE0aPSBxzGG6Uu7RnELtvpzAVxjkALszi4E8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709041181; c=relaxed/simple; bh=pbGQGIp2nH+S292YhpunuhqGMxxdzJpzUTLSu6xY0Q0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=edUMEtjW5EoZ9TGyMpXPKnfQMuoZFlEXS7eN/peQz4B/9XckpAswhRJ4b10vsVAg17ReaYrmrqQW6lk54/k17PLbR9H7yu22cRi2MGuqO8TmzFsAZDJO2Pw78akNEDX8PKxLDqcV+TiOde63aFi05XpCM4M2lfXD2VhXARnuWtY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TuzntUO5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TuzntUO5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FC4CC433F1; Tue, 27 Feb 2024 13:39:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709041181; bh=pbGQGIp2nH+S292YhpunuhqGMxxdzJpzUTLSu6xY0Q0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TuzntUO5nFpdK6M8PCGyay1yOzr8Jr9A6mbz9GafpDDoBktSfaYhMvY5DWRZgDyEU 4UI8JHl79hGCbEJagfR0gFe5aoEatXiczS6p7xtXMTRKAHrcZujAcx7Eo99X13KH5Z yispetne8LqFFEwijNqRr6FdilhG5A3JyPPeRZqo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Aaro Koskinen , Arnd Bergmann Subject: [PATCH 6.7 210/334] usb: gadget: omap_udc: fix USB gadget regression on Palm TE Date: Tue, 27 Feb 2024 14:21:08 +0100 Message-ID: <20240227131637.555422261@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131630.636392135@linuxfoundation.org> References: <20240227131630.636392135@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Aaro Koskinen commit 858a74cb512833e276d96a72acb560ce8c138bec upstream. 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 Signed-off-by: Aaro Koskinen Acked-by: Arnd Bergmann Link: https://lore.kernel.org/r/20240217192042.GA372205@darkstar.musicnaut.iki.fi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/udc/omap_udc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- 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 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,