On Mon, Dec 2, 2024 at 2:27 PM Greg Kroah-Hartman gregkh@linuxfoundation.org wrote:
On Mon, Dec 02, 2024 at 11:36:33AM +0800, Chen-Yu Tsai wrote:
On Sun, Dec 1, 2024 at 8:15 PM Koichiro Den koichiro.den@canonical.com wrote:
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@chromium.org
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@collabora.com #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@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: Greg Kroah-Hartman gregkh@linuxfoundation.org
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?
Agree that it's applied to the wrong node. It won't cause any issues since xhci3 is USB 2.0 only, but we should we fix it regardless.
Great, can someone please send a patch so that we get this correct?
Would you like a revert plus a correct backport, or just a fixup?
ChenYu
thanks,
greg k-h