From patchwork Wed Jul 31 03:44:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 13748045 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6DBDAC3DA7F for ; Wed, 31 Jul 2024 03:45:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=2UbdYL0//iy1qTkoAHNN3QDl4lYvN+Ijx1oBz/ie38k=; b=ul4priKs2k9PKxJOFTIhQaeF9H JzPCR8WRPI8UMOzsIQTWBPKHfobhGe586J2n4JHPtmXtmNJFdHh3yGl+soMmJ3VKf8PCe+yHHVoYm rcNNClYmRg9cXwM7ltYKQ3VJTkDMaeENbgbMIQ2iOtl3oMLQcLcm0NrzMbbJeG0omtc2zYPT/vteO FpkASMwwetGXb1hC7EYHRHQgkYKf31NT+Dw3GQD8rhWw9TtO7ZJKRy/tfy4CXdR78NlQ+ONj6trh4 MveYn0nr4vZICtwsMCaSbduCxdbuLGMpmFa7kO7BmdCYHsKygJOEydcYCoJDImH+goPEnw9aTVKK6 QTyyXOOQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ0HB-0000000HCUm-10Fh; Wed, 31 Jul 2024 03:45:21 +0000 Received: from mail-oa1-x30.google.com ([2001:4860:4864:20::30]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ0GJ-0000000HCBV-2N3T for linux-arm-kernel@lists.infradead.org; Wed, 31 Jul 2024 03:44:29 +0000 Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-2642cfb2f6aso3618887fac.2 for ; Tue, 30 Jul 2024 20:44:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1722397466; x=1723002266; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2UbdYL0//iy1qTkoAHNN3QDl4lYvN+Ijx1oBz/ie38k=; b=U+w/KDu9++rPlFN4aIRp8BiQbt2I7zEklPWszIQOIyWAGYR4MIHefgde23VE97It7I 2mmEYQHJqADuzMBkBl/2/kGarOZbzo72kOLwIn7/7IdaGCIQJoj+zW76/U36bVZN4g1o kvhQw516AqpQRuvKoiOav+thXo2L++rHxsIK4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722397466; x=1723002266; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2UbdYL0//iy1qTkoAHNN3QDl4lYvN+Ijx1oBz/ie38k=; b=aWc39QZNR1E0e6CjxR1TGw7OaPFCWf0fb4Nm7MIKcRjpb2WfNLqIaznUi6GBrYZHen XjB9ByT9rRYYkvIyrotUtODRor0JQGSuyfWW7ZZa0RQaLUDoUbr78T6ciBURkVwN1Otk Mm8fWJGSM7ne9e8mI6qGDYa9ck5BOZoVD3GynVWccYVR5ENA+cc1aBZoqDYVNFAng2c2 GI6nrAhy+xXo2RCjosT4BFMDOgd/8YWBwK17iD6TSZXvRq6Ci1cmp1JyE0hujkVJKWOr uSO9pISZt7Yx6FD9ouBVqBhi6jtEjbG67E2Ju1DNQPGDNgJbt0JATWmMIM77LBhYPs1t XQKw== X-Forwarded-Encrypted: i=1; AJvYcCUZv3YwVQC9mbF3mnbH6aQwIhbgpwtMhVxUKLcHyf0X/GMl7cd3NikqT/aV2qc2y2ssbXQj7BhbJ2GlbnUovh39ribxyq1hzxNXrSpWY7vfsKfGWmk= X-Gm-Message-State: AOJu0Yx0Qz9psiv1IuBbAdNii6Hcf+QIiMQmvIBKqFSQc6+drv0BnbDh 7BMktBOMUX9BaJ8GSlmBpPWNKIGBX6RGxk/Qy5slCQme+9EVicJ2wRvkkHA/rw== X-Google-Smtp-Source: AGHT+IEivlqEbXkttxrz/Rxzu9Cp9uzqYmDsPqNMDSXXzrPkDIW0pOckbHR0f0HuMPjBNI+AfizI8A== X-Received: by 2002:a05:6870:6120:b0:261:1fdc:4945 with SMTP id 586e51a60fabf-267d4d94a43mr16322317fac.26.1722397466358; Tue, 30 Jul 2024 20:44:26 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:1cfb:e012:babc:3f68]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70ead81230bsm9093008b3a.120.2024.07.30.20.44.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jul 2024 20:44:25 -0700 (PDT) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno Cc: Chen-Yu Tsai , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prad?= =?utf-8?q?o?= , stable@vger.kernel.org Subject: [PATCH 1/3] arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled Date: Wed, 31 Jul 2024 11:44:08 +0800 Message-ID: <20240731034411.371178-2-wenst@chromium.org> X-Mailer: git-send-email 2.46.0.rc1.232.g9752f9e123-goog In-Reply-To: <20240731034411.371178-1-wenst@chromium.org> References: <20240731034411.371178-1-wenst@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240730_204427_655773_DF6BC1D0 X-CRM114-Status: GOOD ( 11.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 #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: Signed-off-by: Chen-Yu Tsai --- arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi index fe5400e17b0f..d3a52acbe48a 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi @@ -1404,6 +1404,7 @@ &xhci1 { rx-fifo-depth = <3072>; vusb33-supply = <&mt6359_vusb_ldo_reg>; vbus-supply = <&usb_vbus>; + mediatek,u3p-dis-msk = <1>; }; &xhci2 { From patchwork Wed Jul 31 03:44:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 13748046 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6A0C5C3DA7F for ; Wed, 31 Jul 2024 03:45:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UNo1lCfbQqGMSbbgOcd9nX2zDqzbGx3C0Iq0m1Inhbk=; b=FQxnbThqcBlepx4PqiW9TUTZtL dQdI9gdPaMO3fXJf501o8P3JbNarkdMNuqU3kDSFRMmMBwhghhp6HflqrHZey+oUi2Dsyn/FIByQs lJNEG6uYV8b1F8RqczIGOHpbdxHjhnyHY4IgTMUU11BrJtfjHiU3Xc1cMJzA4Sewp/za2VUbXsMzT hrGldwum7H2euWGDW6lwVfCp2q8vTgudo4ZbqYwtERAyg0XFEUN1Rm/bg8jCl8hBv5bCSZnDJkCpI fRVKUVZka9w/B6Um7+cIZV/7kuu4EKJKGFBEOQgyG/ohtUl+KDMohGo4KKUFyKgqilXlF5TE2RW3J byCRtQtQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ0Hc-0000000HCdB-13XB; Wed, 31 Jul 2024 03:45:48 +0000 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ0GL-0000000HCCJ-2xVc for linux-arm-kernel@lists.infradead.org; Wed, 31 Jul 2024 03:44:31 +0000 Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-71871d5e087so4026025a12.1 for ; Tue, 30 Jul 2024 20:44:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1722397468; x=1723002268; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UNo1lCfbQqGMSbbgOcd9nX2zDqzbGx3C0Iq0m1Inhbk=; b=jlM4CLQ3Uab+jRF76knpurAAgu/NVoDqkZAtd7FxrEdX4dNJMHtt6mXL09PEorKn7F cQ3cgGBpIbc2V9Iig7g0qxCsj8A0+bqSD+osTWtVMLTGVSk7p5sl8cRSLwKBsznh5h+Z 0ZqTEEtXSY/fPGSSVpT4l1pnZjC0J9yTYtZTA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722397468; x=1723002268; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UNo1lCfbQqGMSbbgOcd9nX2zDqzbGx3C0Iq0m1Inhbk=; b=F6nAB6VePKOJFGpj5waPezlKLoqun0GNH4kRzbkjvCF/VEvmuqKVN1r4szk3dn9sqO VI2TqgDUc65HJWlMKgrNZL6Wy+1h24sYvoVtmefO8iCW3GMU0dAPk2f2zpIfy82zC/nu WK2uOeoIDLInFp/eU/ur6/y7J+LKmTK7vroozWmucp6v4TIEeYGNaMOQvJa+rbWhLfJL aeIsh1/uzqw305B4rlLdz3nfsPkBZN6lMjFGVJfm23+tGixj9OAJoAEvroGBcmP9oBkN XKLjgnzf53ThT/IgjFeh5P4kOD8fnqGaveFm7QKUdQIsL2QCRPBELyKWzuAy+uU8fHdB qw8w== X-Forwarded-Encrypted: i=1; AJvYcCUYRKazWs13xHZ3beZ1CZoZqaP8mRlq73FqKkhB77e64DSWxGnqFM5qPHq1kQssrKpTaDjZFnIA4VVZwPpugMUny4Ei/Fc9/7aee700JaaOmNBYynw= X-Gm-Message-State: AOJu0YxijdkFmbMdHeNZ6UT3nb51qs3BeeYP6rI3cn50QMhHyG6z2FIq KvMTqQ6w1quOV0DQ5syCa0yKX5CzEYFk28lT/k8I0MKFnqQjTtDME/ogVIEl/w== X-Google-Smtp-Source: AGHT+IE4FtnaiOt7PwGIeleyxseVrMrvg2bK54AvWowVA2QcZrnOLaPels+TJcjIfagIHeg10n/CWA== X-Received: by 2002:a05:6a21:328c:b0:1c3:b47d:d53f with SMTP id adf61e73a8af0-1c4a12e1129mr17571072637.25.1722397468531; Tue, 30 Jul 2024 20:44:28 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:1cfb:e012:babc:3f68]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70ead81230bsm9093008b3a.120.2024.07.30.20.44.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jul 2024 20:44:28 -0700 (PDT) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno Cc: Chen-Yu Tsai , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prad?= =?utf-8?q?o?= , stable@vger.kernel.org Subject: [PATCH 2/3] arm64: dts: mediatek: mt8395-nio-12l: Mark USB 3.0 on xhci1 as disabled Date: Wed, 31 Jul 2024 11:44:09 +0800 Message-ID: <20240731034411.371178-3-wenst@chromium.org> X-Mailer: git-send-email 2.46.0.rc1.232.g9752f9e123-goog In-Reply-To: <20240731034411.371178-1-wenst@chromium.org> References: <20240731034411.371178-1-wenst@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240730_204429_766495_4AE0CD7B X-CRM114-Status: GOOD ( 11.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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. Fixes: 96564b1e2ea4 ("arm64: dts: mediatek: Introduce the MT8395 Radxa NIO 12L board") Cc: Signed-off-by: Chen-Yu Tsai --- arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts b/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts index 4b5f6cf16f70..096fa999aa59 100644 --- a/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts +++ b/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts @@ -898,6 +898,7 @@ &xhci1 { usb2-lpm-disable; vusb33-supply = <&mt6359_vusb_ldo_reg>; vbus-supply = <&vsys>; + mediatek,u3p-dis-msk = <1>; status = "okay"; }; From patchwork Wed Jul 31 03:44:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 13748048 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B0D52C3DA64 for ; Wed, 31 Jul 2024 03:46:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=11m/HeUZui+l9rC09B4iar2D4HclxMkveTVuMFSiXTE=; b=UitM+xFl/3zcvu90INj+XthL0w +2HYfE4+qZlCmO2E8U5En0t4PVF2iAEfjTTcHXVHtL2x3pxwEuJYiE1nWFXZLRr5+EKODFjlGiJUU 2aZBcR5OAE+tsuDeudIloH2e9zoL+YNiT+s7l+9+5/icSSGLHhUPJJYPNTrV/P9A4aJ2TsMyrHqWU v/D4cApxkBWmn9BSqo2W0nZOL4moWOVyRYWxcwS1rtDE+X/+6eTtFp39IdTZG3HSjFGCYHJVnSsbc f36+kUzpzYsx2Iv334kj68XNoTuDXWmCj8tk0B8e+BmrZ87Kxpv/GwflDux8VC8TSYTRo0F3Eskxt Xe7RxOog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ0I1-0000000HCim-2JS4; Wed, 31 Jul 2024 03:46:13 +0000 Received: from mail-oa1-x2c.google.com ([2001:4860:4864:20::2c]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ0GN-0000000HCCw-2x1J for linux-arm-kernel@lists.infradead.org; Wed, 31 Jul 2024 03:44:33 +0000 Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-260e6dfc701so3329312fac.3 for ; Tue, 30 Jul 2024 20:44:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1722397470; x=1723002270; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=11m/HeUZui+l9rC09B4iar2D4HclxMkveTVuMFSiXTE=; b=iZEN6xTY6Dvax17UFGJXqFM69M1Xt21nFaURc4srHhBMKOptFLFn+S7IhxldYh+dhM fBcilFRv7xSf3HxRV+gmrZA1C6IcfU+uJl19FiSBzwDhJ5lMRPAlrIj0cBJcvVsDp34f K8SFGC1o+Ci5IsMcOVfbEujg7IacwzpMiFILA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722397470; x=1723002270; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=11m/HeUZui+l9rC09B4iar2D4HclxMkveTVuMFSiXTE=; b=mTtmSYA89e6A52ykOMNk8UR3pVf+KEIJPuafd0JkDb7c4UjUXQeOLXgL2t5j6q58+K BNWGw6/AvLyuo1nMhwuL50N3g1mC16M6hCY/HbUuwTKzN7rBsSeNwrncjgeRf6D3Od4P TkZe5DBTJ+B4AIbxFJ8c1O6QL1yhskMDsAOsixkBWgzBkaqP/MbCj7OrUBpmqaIubwJ0 6PF7O2bNGpU2WI7/jwQTIn/Ez6LRs8py/GntvjWQIHgsxw46rKbAdYsBFJwxL5ZJP4fa XYaf6YbjZdiPN/ZGb5GoLi7xBe/FkqKo3dSTgrECMmWXFD9BQVeVKIUfmzAdQDAC8WQE 6CnQ== X-Forwarded-Encrypted: i=1; AJvYcCX04GWYnwc+/yC8YI8bSIviKzIwXmMzSD8MQ/DBlqUX+BtS/WsjkbqksTwoNA8+MfTl7IevX4TdVNYn6AxvH28h+iK7e3FUbYn7h8W4tL+OdavgcOo= X-Gm-Message-State: AOJu0YwGSrUJHf+yarCGAvqlrPs2M/Ss3+4JrUGmJlr2macYH0YH5XwT /hYs7L8edA3VSs4i9rgolntHBVf70q/CDHtOtSF2DLz6X4WFIztmmWU+vMRd4w== X-Google-Smtp-Source: AGHT+IEy47mf3dU8J89PBwPURHRmTajXHBhlXBEf4nsrJgQUp+s+hvQeYpO0EE6KZSG0treE+Z4MAg== X-Received: by 2002:a05:6870:2cc:b0:261:113c:1507 with SMTP id 586e51a60fabf-267d4d5b51amr15027926fac.20.1722397470604; Tue, 30 Jul 2024 20:44:30 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:1cfb:e012:babc:3f68]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70ead81230bsm9093008b3a.120.2024.07.30.20.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jul 2024 20:44:30 -0700 (PDT) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno Cc: Chen-Yu Tsai , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prad?= =?utf-8?q?o?= Subject: [PATCH 3/3] arm64: dts: mediatek: mt8195: Assign USB 3.0 PHY to xhci1 by default Date: Wed, 31 Jul 2024 11:44:10 +0800 Message-ID: <20240731034411.371178-4-wenst@chromium.org> X-Mailer: git-send-email 2.46.0.rc1.232.g9752f9e123-goog In-Reply-To: <20240731034411.371178-1-wenst@chromium.org> References: <20240731034411.371178-1-wenst@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240730_204431_786567_E8382653 X-CRM114-Status: GOOD ( 16.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org xhci1 has both USB 2.0 and USB 3.0 host capabilities. By default both are assumed to be enabled when the controller is enabled. To disable either one, an extra property is used. Since the default has both enabled, both PHYs should also be assigned to the host controller. If a specific design uses only either one, the board specific dts file can override the PHY assignment together with adding the "mediatek,u[23]p-dis-msk" property. This keeps both changes together. Signed-off-by: Chen-Yu Tsai --- arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 1 + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 2 +- arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts | 2 -- arch/arm64/boot/dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts | 1 + arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi index d3a52acbe48a..c98fe9a39b90 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi @@ -1401,6 +1401,7 @@ &xhci0 { &xhci1 { status = "okay"; + phys = <&u2port1 PHY_TYPE_USB2>; rx-fifo-depth = <3072>; vusb33-supply = <&mt6359_vusb_ldo_reg>; vbus-supply = <&usb_vbus>; diff --git a/arch/arm64/boot/dts/mediatek/mt8195.dtsi b/arch/arm64/boot/dts/mediatek/mt8195.dtsi index 2ee45752583c..61b3c202a8cd 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195.dtsi @@ -1444,7 +1444,7 @@ xhci1: usb@11290000 { <0 0x11293e00 0 0x0100>; reg-names = "mac", "ippc"; interrupts = ; - phys = <&u2port1 PHY_TYPE_USB2>; + phys = <&u2port1 PHY_TYPE_USB2>, <&u3port1 PHY_TYPE_USB3>; assigned-clocks = <&topckgen CLK_TOP_USB_TOP_1P>, <&topckgen CLK_TOP_SSUSB_XHCI_1P>; assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D5_D4>, diff --git a/arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts b/arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts index a06610fff8ad..1ef6262b65c9 100644 --- a/arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts +++ b/arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts @@ -904,8 +904,6 @@ &xhci0 { }; &xhci1 { - phys = <&u2port1 PHY_TYPE_USB2>, - <&u3port1 PHY_TYPE_USB3>; vusb33-supply = <&mt6359_vusb_ldo_reg>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts b/arch/arm64/boot/dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts index e4b2af9489a8..e2e75b8ff918 100644 --- a/arch/arm64/boot/dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts +++ b/arch/arm64/boot/dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts @@ -1111,6 +1111,7 @@ &xhci0 { /* USB2.0 M.2 Key-B */ &xhci1 { + phys = <&u2port1 PHY_TYPE_USB2>; vusb33-supply = <&mt6359_vusb_ldo_reg>; mediatek,u3p-dis-msk = <0x01>; status = "okay"; diff --git a/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts b/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts index 096fa999aa59..14ec970c4e49 100644 --- a/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts +++ b/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts @@ -894,6 +894,7 @@ &xhci0 { }; &xhci1 { + phys = <&u2port1 PHY_TYPE_USB2>; /* MT7921's USB Bluetooth has issues with USB2 LPM */ usb2-lpm-disable; vusb33-supply = <&mt6359_vusb_ldo_reg>;