[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241202081624.156285-1-wenst@chromium.org>
Date: Mon, 2 Dec 2024 16:16:21 +0800
From: Chen-Yu Tsai <wenst@...omium.org>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Sasha Levin <sashal@...nel.org>
Cc: Chen-Yu Tsai <wenst@...omium.org>,
stable@...r.kernel.org,
linux-kernel@...r.kernel.org,
Matthias Brugger <matthias.bgg@...il.com>,
AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>,
devicetree@...r.kernel.org,
linux-mediatek@...ts.infradead.org,
Koichiro Den <koichiro.den@...onical.com>
Subject: [PATCH 6.1 1/2] Revert "arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled"
This reverts commit edca00ad79aa1dfd1b88ace1df1e9dfa21a3026f.
The hunk was applied to the wrong device node when the commit was
backported to the 6.1 stable branch.
Revert it to re-do the backport correctly.
Reported-by: Koichiro Den <koichiro.den@...onical.com>
Closes: https://lore.kernel.org/stable/6itvivhxbjlpky5hn6x2hmc3kzz4regcvmsk226t6ippjad7yk@26xug5lrdqdw/
Fixes: edca00ad79aa ("arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled")
Signed-off-by: Chen-Yu Tsai <wenst@...omium.org>
---
arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi
index 39e4f6a560f9..9180a73db066 100644
--- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi
@@ -922,7 +922,6 @@ &xhci3 {
usb2-lpm-disable;
vusb33-supply = <&mt6359_vusb_ldo_reg>;
vbus-supply = <&usb_vbus>;
- mediatek,u3p-dis-msk = <1>;
};
#include <arm/cros-ec-keyboard.dtsi>
--
2.47.0.338.g60cca15819-goog
Powered by blists - more mailing lists