From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5A331D79B3 for ; Mon, 2 Dec 2024 08:16:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733127375; cv=none; b=PAC5P9MO+QYATqwMiamkb6Xz05H49fb1UICEfyAjIoCvHE9vkrmoA45dirVWHkli4VI+juo+KAIRFki7LqeT5U8bmSeJNHgU2G6ePypO8tSQI+8qSi75B9mK07OjOVQ5oDU3RlhfeeppdkKUOoxTz1hhkxajbZvGktjrbQW7dXs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733127375; c=relaxed/simple; bh=cKjQ4U+62O9DIJTfWQt+BVUMCS1OvPdRfnbG1jjIL1c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=slxZMkOxqnySu66yMmroMsLLgezBNnH586faoIw1k1+mBuIh5vYFQZpbzyZ46hIlUVAi3/Iuc+jCAKR11HEe61djVYvXtDSgsIvB8SezxQ++mF8h44WeYwgrCpokNT4uczK8slekkUK5OV4HorrlSO7IAfD8H68i3mBFyxrz2eE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=UsOE4jgC; arc=none smtp.client-ip=209.85.215.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="UsOE4jgC" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-7fc2b80c845so1722355a12.3 for ; Mon, 02 Dec 2024 00:16:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1733127373; x=1733732173; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=9gfcfEqLWRgyB2HQV5UbiI2sXq612OlwtqN3jGuE7po=; b=UsOE4jgCSyuHkG897ntJ9p1fVrOz1ta324z6HymQYrDKnsGNM+2pFtX2/2O76jVuWN QFLw4Ed6O2TrItcCG52t6eGt+w3Jy0TguwSEdEPc4FzMwY+ek/mwyskAHBFz5PgLtbCP bL/akNDhw1MCRPXxRE7jQV3QPGrXkeFXXl0jY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733127373; x=1733732173; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9gfcfEqLWRgyB2HQV5UbiI2sXq612OlwtqN3jGuE7po=; b=sqlKm72I5HzljXYYOixGDITkOGVBvwlWTWcQyXAFlV75Dvv0KfrW8DZ9zk0oqisOqE hFtgVRZ6GRy8u+Po361As0aLESwcckHHPdsiwUFpZaqC5fc9v/BF/fe6RI6vV5si1cqg ysV7aBLR97Zgr8AgM78lygD5pAailg5uY+Ak6KFwkukCm+aeZUcZggVKoFbJbCP8Pb2p NQNwGtlnLxWwhZzqm/iCWPiq/Lvp34hMQ9xhRJj6Hcrkmlc6pBXuw/+4glyJ1z8crU2X RPrjcdbgMUBsKJOcIMq/iZm/M4W2BU89QmkbeuxFRa5D6jB9BnBcw5Q5F0fmfJJSn03w VA8Q== X-Forwarded-Encrypted: i=1; AJvYcCXC60E0+GKI6kV1wzqVX3uXdX1gIoLSyCTICbY+27BLHdWXCgmCVsn8iib8ZkgdPutx6Qylgi+K1kZCNuA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz3Npibb5HL64oKR3ZD9idqzJ57s/1G82NdcHYcXi/5Wrm4DB+4 eSdibvBo6sENt/t7pKK7KzGTanpTdA1LV6FIPWnGKNFBTP2NlZ33byca1/JUWw== X-Gm-Gg: ASbGncuJV/i0mfLcftOZRBNNG8vuOSKf8SnSj6yonWT8IrmXHkfmfrSen7xAHUB+IeV yWIoM4dcDvAO+NCmj4ecXGr+iB9H6ran9iH1dxr7gcWZ7YinujJ6aLAXq19ix4lrJ0gD/gSTbpP AuA+ai/sSgvkePQqbQGVdQRQmLIi00pp+z5i1YwEYyTNq664gWVW5IQAtwMVIo3n60DW6roz8AT OGH/+zCmgCXGMiMa65QbijO77aeW3VFevdc59/WYh8nD2cSS2U0qy2X2bIxrTjre23e X-Google-Smtp-Source: AGHT+IFqZTzJX7eXH4gzncrgMaOzS5d2OoQ3YCV38eFWBvyrMOWlzrisueoiJ989ZcLF70r9MzLOag== X-Received: by 2002:a05:6a20:1593:b0:1db:df7b:471a with SMTP id adf61e73a8af0-1e0e0bf54d3mr32960644637.43.1733127372940; Mon, 02 Dec 2024 00:16:12 -0800 (PST) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:94c8:21f5:4a03:8964]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72541848505sm7891833b3a.178.2024.12.02.00.16.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2024 00:16:12 -0800 (PST) From: Chen-Yu Tsai To: Greg Kroah-Hartman , Sasha Levin Cc: Chen-Yu Tsai , stable@vger.kernel.org, linux-kernel@vger.kernel.org, Matthias Brugger , AngeloGioacchino Del Regno , devicetree@vger.kernel.org, linux-mediatek@lists.infradead.org, Koichiro Den Subject: [PATCH 6.6 1/2] Revert "arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled" Date: Mon, 2 Dec 2024 16:15:49 +0800 Message-ID: <20241202081552.156183-1-wenst@chromium.org> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This reverts commit 090386dbedbc2f099c44a0136eb8eb8713930072. The hunk was applied to the wrong device node when the commit was backported to the 6.6 stable branch. Revert it to re-do the backport correctly. Reported-by: Koichiro Den Closes: https://lore.kernel.org/stable/6itvivhxbjlpky5hn6x2hmc3kzz4regcvmsk226t6ippjad7yk@26xug5lrdqdw/ Fixes: 090386dbedbc ("arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled") Signed-off-by: Chen-Yu Tsai --- 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 34e18eb5d7f4..b78f408110bf 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi @@ -1312,7 +1312,6 @@ &xhci3 { usb2-lpm-disable; vusb33-supply = <&mt6359_vusb_ldo_reg>; vbus-supply = <&usb_vbus>; - mediatek,u3p-dis-msk = <1>; }; #include -- 2.47.0.338.g60cca15819-goog