[ 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) 6.1.y | Present (different SHA1: edca00ad79aa)
Note: The patch differs from the upstream commit: --- 1: 09d385679487c ! 1: 0d2c7a29a4219 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.1.y | Success | Success |