On Wed, Oct 02, 2024 at 03:01:12PM +0200, Greg Kroah-Hartman wrote: > 6.6-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Chen-Yu Tsai <wenst@xxxxxxxxxxxx> > > commit 09d385679487c58f0859c1ad4f404ba3df2f8830 upstream. > > 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. > > Mark USB 3.0 as disabled on this controller using the > "mediatek,u3p-dis-msk" property. > > Reported-by: Nícolas F. R. A. Prado <nfraprado@xxxxxxxxxxxxx> #KernelCI > 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@xxxxxxxxxxxxxxx > Signed-off-by: Chen-Yu Tsai <wenst@xxxxxxxxxxxx> > Link: https://lore.kernel.org/r/20240731034411.371178-2-wenst@xxxxxxxxxxxx > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@xxxxxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > --- > arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 1 + > 1 file changed, 1 insertion(+) > > --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi > @@ -1312,6 +1312,7 @@ > usb2-lpm-disable; > vusb33-supply = <&mt6359_vusb_ldo_reg>; > vbus-supply = <&usb_vbus>; > + mediatek,u3p-dis-msk = <1>; > }; > > #include <arm/cros-ec-keyboard.dtsi> > > It looks like this change is applied to xhci3 instead of xhci1. The same appears in the backport for linux-6.1.y. Could you take a look? Thanks, -Koichiro Den
