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: 13748042 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 6B64CC3DA64 for ; Wed, 31 Jul 2024 03:44:56 +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=MSSQI5+z4K1t3REfGSCPIGCYbI N3VKmJpTAPYJEtuHMSwBW+T8YIEL/QeOqT2oI3xiuwKutFPTwjtEkyum+Ix+g0rR0IF1Dp9xaIQ+W a6YEV5RfwyS+gtnIsVVrZL+yDVArelt0sik0exkXphEK1FgmtaIRjGTnX31zc0o14PFQKklf8luq5 2EsExIfAEm6aann5BjujmafhEWpAz/+mt+dzybA/mbPk9+ksHMmo2jMklRIQI7ABQ9U87XWG+KUOK bXZxgWR45uBqWXnL6fx8QHch8qnhy4Q10uR3JzwN3fWDCpOqWgZipwID5Bp9/J1CAEjfSIb+tq0ih 0sjVhtKw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ0Gl-0000000HCKo-3ytd; Wed, 31 Jul 2024 03:44:55 +0000 Received: from mail-oa1-x29.google.com ([2001:4860:4864:20::29]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ0GJ-0000000HCBU-1nzr for linux-mediatek@lists.infradead.org; Wed, 31 Jul 2024 03:44:29 +0000 Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-2610623f445so3640108fac.1 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=J/CEV5GYEJbiBPbC3MG0k365rCr7clFK5YKp3lyJwX80IK2TyqgFlSq0JziIBFpZ3H XQlZ3PX/KX+yNaPlu7EpsA2Qnt2OvqLVuDI9SvzgPPUSlnvhLG+xNhBGtxz7pkPGPeUa 3a0pSpQMN29kg9EC5xlqCRHUEfQDoKPqr/jO9fx32grocd96FUrkxK8uC4TgfBC6OzDW zqqLsjREDTmDarOacqcIC7zv20KJnthpY2cigoRt0F5JCWdvVwX/yEVeGJhejQp91H0d SLYD+HDYBJ1b1zk42M0xP6f6DrJ2dQuWRtHQBfsOxS8sgYZuzmq9P3T9+ws/XSkwbwQo SgdQ== X-Forwarded-Encrypted: i=1; AJvYcCXV71j9t1NkNjWfgUbpyITazNiN84/84V7KDhsmHZDgHyAAcgp822XjemXuNsvD8pZM5KmZoxBxRFvEH55vO1GjzIZbLs8WWNNWvULsuslWG4hK X-Gm-Message-State: AOJu0YwZr0CWqXcF/6xMW1bNEcNy2Ka6gbparsJlyxtgagLREy0zEaND GMd2IJ8hhdaFZ2Vkw8pMSNSIdlSWuWV4jnDBxe2nLQSoIupX+KewhNfkvu1b8w== 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_490344_2E28771F X-CRM114-Status: GOOD ( 10.76 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=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: 13748043 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 617C9C3DA7F for ; Wed, 31 Jul 2024 03:45:22 +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=r2KTIa/YEFhecPxUBb8Dno2iG2 nvKJ02CkgA/15JiyiVcHdwJBKX3I48YhvRSozMXrCT6OiQQAgKV3XTYCsFIVA0b/n7R3CribuOXn7 +8n3QFpzfH+SqNsg1/eoNPYruimw3D34QDhGLB46+rT2fDfx90Rn4Da9s2G/O+JnWlxBrk0fMqeC+ fRWu7S9fyRZ8vvR0G+09Yoqhx+lWK7lyV8VNkjbkjyvOCUJfOy6kC3oN2UbBiLTFsRr85xYeBuHK4 3WqZbW/9cPOIXkbvVlQdyrKLM62+OtTPbeawArTCBbYN0nvlKBVGM8/BOXAw5tE/M87mHsAQTsW89 7sTUmNZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ0HC-0000000HCV6-0Dr3; Wed, 31 Jul 2024 03:45:22 +0000 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ0GL-0000000HCCK-38TE for linux-mediatek@lists.infradead.org; Wed, 31 Jul 2024 03:44:31 +0000 Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-7ab34117cc2so3540574a12.0 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=FFzsBqJ+yLMAYqRkGrlUPf8dJf7DRObYq1y8sUgQo5/lX5SERrGOIM9FFZ6gHD8yzi dftkTKDi4alTmVXRn4FLJnAkAjqbyv3y5aVwUgHbv1JirVgf4sJQr6jAqqbImJ7sbCbV qKZRkVUuSU4LwyeEaIy2CDw+KYwLdm0Qxw6SrnErVvmbahNio5Pu7PEx2cFGUSpDKD2O 8TbS8m/EftxqR1Q3N8Bu3CYrQe3wAkDZhXWbyWRaroOQRU/QV4vhYb/SV9Hc26ZNTLlq uybv3RPHxXFiz/5zZJnsTmnkYvm96cKf/kbU6miGLASReBk09e+qvAwa9vv09aNlS8rg 7UoA== X-Forwarded-Encrypted: i=1; AJvYcCVQLotnGy2cpcGMlC4I/0V/KmkclItyRiQvMRJjLAt4XNjEeQraR5MJY0TaJ3z+Bcguhq85qSfZjf7ZEnY/auTXd9JkH9HxvoI+M/6qfOtIpXj/ X-Gm-Message-State: AOJu0YytKNnQeAtsWXGlLySpUQrEepe5vnmS6iy3/0X3jbNp4wZkJk3m QuochnyIs77y3ANN2Y5e+DwF7IXk83HzOOXXj67BRVriOEUUSQWTdB4GH/45OwzMFUqNYAjnWss = 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_793756_5AF27F43 X-CRM114-Status: GOOD ( 10.55 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=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: 13748047 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 6F1A3C3DA7F for ; Wed, 31 Jul 2024 03:46:14 +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=zrpwNqdsapUMDQGe6oTADH9QkK 1uy3PbCf8uMzO5ALD6avfyYMn4Q3957P0ql4E724Fnjv+ZhKlXa+yXifVboAdCCCErIpElUYgVo2k 18j24BTFUbTCv1E2pGSG9JCm/Fecz6SaXOAnJPj0aEqFiPtikth9AfJ/FY9RUP3rqjt1uEqahfJtk CW/5sh5qRQjR39NAH4q9nOfyK/OeOO97Cq0P2J9bPWy6iaH0AUTI4LBE+aUptb0gx/JEw2D+fst8U qPM9IY0cE927ObToRujsNjQSJV0QcP8wviFqMnbNYi6TwoOmzAImNaZfOXR1DWV7iq4DzZAm95a9l fYUrOrig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ0I2-0000000HCis-0YEs; Wed, 31 Jul 2024 03:46:14 +0000 Received: from mail-oa1-x34.google.com ([2001:4860:4864:20::34]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ0GN-0000000HCCx-2xT8 for linux-mediatek@lists.infradead.org; Wed, 31 Jul 2024 03:44:33 +0000 Received: by mail-oa1-x34.google.com with SMTP id 586e51a60fabf-2611da054fbso3423335fac.1 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=NqN018JxOV/YrwGCm9LO9abaynCvEtKmqT5st9EwA2rYwuc/p8ZuZh8sjHnRr6QQKi 3eSf485wtk2vXcNmyq+mT9270cBmLokgp11eQwmL2qANTnheRbF3iYOFdTHoAa5Lpewy K0M49+Oi8FSS/wXPwWbtFi9pcuKPKaH3rSJ9kxsVxxpoDP603r2TKUGK/S0CgqI7nfMW KpFRui+Sgqakecx5qVxvu3NLZIZh6cNftxxjwY2Sx8wHTm2pIEJHoyxwpSIhx4/k8GTl MdMrJ/jUHrDKpaWzdvMBm2TqbYdGFP3HqCqV85gdX7GpR6DCr1euefJIXisQ1dssFh5a +0nQ== X-Forwarded-Encrypted: i=1; AJvYcCVDB8kNcqzfJid0GjT+j4InNyhN3IBpi+UgaAc/p7RyrfFUPb130XsV8HTaIll5Bog+m77iwKqL+mDILOitz+ZcUVHdxMfglmul8kRSnhu829vF X-Gm-Message-State: AOJu0Yxyp2JkP+qXvEIK9e2pHhH3g/AhtkAr7t+gRjuUMiL03QVGYr64 HIhXbOqZjdfBvAHERaHYEkPjriRVf/kTsKPqd0n62O0fQKzrkwrSvPb/GuT+Dg== 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_774322_56F638B3 X-CRM114-Status: GOOD ( 15.17 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=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>;