From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Chen-Yu Tsai <wenst@chromium.org>, Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.6 2/2] arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled
Date: Mon, 2 Dec 2024 09:26:52 -0500 [thread overview]
Message-ID: <20241202074010-65b0a4acbd94004f@stable.kernel.org> (raw)
In-Reply-To: <20241202081552.156183-2-wenst@chromium.org>
[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 09d385679487c58f0859c1ad4f404ba3df2f8830
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.11.y | Present (different SHA1: 598cfa441b59)
6.6.y | Present (different SHA1: 090386dbedbc)
Note: The patch differs from the upstream commit:
---
1: 09d385679487c ! 1: d9497f1e98c62 arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled
@@ Metadata
## Commit message ##
arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled
+ [ Upstream commit 09d385679487c58f0859c1ad4f404ba3df2f8830 ]
+
USB 3.0 on xhci1 is not used, as the controller shares the same PHY as
pcie1. The latter is enabled to support the M.2 PCIe WLAN card on this
design.
@@ Commit message
Closes: https://lore.kernel.org/all/9fce9838-ef87-4d1b-b3df-63e1ddb0ec51@notapiano/
Fixes: b6267a396e1c ("arm64: dts: mediatek: cherry: Enable T-PHYs and USB XHCI controllers")
Cc: stable@vger.kernel.org
- Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20240731034411.371178-2-wenst@chromium.org
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+ Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
## arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi ##
@@ arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi: &xhci1 {
- rx-fifo-depth = <3072>;
+
vusb33-supply = <&mt6359_vusb_ldo_reg>;
vbus-supply = <&usb_vbus>;
+ mediatek,u3p-dis-msk = <1>;
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y | Success | Success |
next prev parent reply other threads:[~2024-12-02 14:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-02 8:15 [PATCH 6.6 1/2] Revert "arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled" Chen-Yu Tsai
2024-12-02 8:15 ` [PATCH 6.6 2/2] arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled Chen-Yu Tsai
2024-12-02 13:00 ` Patch "arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled" has been added to the 6.6-stable tree gregkh
2024-12-02 14:26 ` Sasha Levin [this message]
2024-12-03 9:11 ` [PATCH 6.6 2/2] arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled AngeloGioacchino Del Regno
2024-12-02 13:00 ` Patch "Revert "arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled"" has been added to the 6.6-stable tree gregkh
2024-12-02 14:26 ` [PATCH 6.6 1/2] Revert "arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled" Sasha Levin
2024-12-03 9:11 ` AngeloGioacchino Del Regno
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241202074010-65b0a4acbd94004f@stable.kernel.org \
--to=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=wenst@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.