From nobody Mon Dec 15 22:06:23 2025 Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) (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 A79AD4F8A0; Wed, 15 Jan 2025 01:26:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736904404; cv=none; b=EX74QdACVrwvNPxQgJG4EHEY5aeqyuWKy0sKWDn1d47svyEl0tfPaPuuQsYsoVfAYw0Xchz0o9zQrm7YXI173RMVgmBClUbUHsplgimZOrw5eDnCfktILh+kaQnaEoQivpdH8JOvoyQ4Te2TKa8lcqImFZ4yVqZOHhqhuYpjDNo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736904404; c=relaxed/simple; bh=Kt3285kcFQ7xUZscpN/vr7QN13NC5mXLe1j/veh3/ug=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KwUu6j6USuTyamGrCrrkiGA8xDZA4j7va8nFZLpWuL65gqc/aT7TKMS+PJUus2e/QhfDhjV9WKCmPrSNZbO/HijpMiH8w9GyuxtF580s/Ia0jnpY90htK02lWICBCiI8fXtWme2G8WotOcgzJah8wLTKQJxaqXo3vex5BCf3rpc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VVNMR9pc; arc=none smtp.client-ip=209.85.160.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VVNMR9pc" Received: by mail-qt1-f178.google.com with SMTP id d75a77b69052e-4678cce3d60so59701531cf.2; Tue, 14 Jan 2025 17:26:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736904401; x=1737509201; darn=vger.kernel.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=TW/78u/K4Tk/9Y6Jt2yXAKfWS6TVs/Gwl1yC2tUVx0I=; b=VVNMR9pcp2UoGARzLXfK6fdaUVCOWa8XkYHEIN0UkoO4iHx+9Q2o9Yv06yXzFi1c4q e2yYGzcpIifsm4bSjHNYRnkTE/AWcMeiHcYx3kBW/FHpQsirxnCGVlh5p2L063XB3klg UP81nF8n0sd3WTf9sP2X83eVDQvTFMKweH97rnD8e9gO9k0H4Bu2QQgSMVHwAnOYuND3 AiUUtipu4E4KmwsnMwxTGeAEaPLSIYEZRUc7inK3ThaWRv8EahgXgbfr93jCP49ec/ZS Vkuj8doMdqYCBiNZhDux0IUGAct0By4CEVXbDc351LQ3VAeR4nmAF81n+UBSU2gIa8rQ kJCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736904401; x=1737509201; 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=TW/78u/K4Tk/9Y6Jt2yXAKfWS6TVs/Gwl1yC2tUVx0I=; b=j+fvHIRyZkKHVBLFxZtacGN/icbmjnDwS7BknJw3MieMQ4waojUHvzdrcZIgmwWDCx zxA38npuB36Fdrpm5A24fayUYriabgqQwYP6K+GjaKqfaYmAt3mTK0yf6MWjIjCxbMeC XPjV8om7dPLDIHVZCSQNwPb1v33DBUAEM1sa7qqY9T4nyw1BXyc2gPUrbb8EYys3wNIc ynpsC+gv9wcbqaguoQUw9NY4efli3PQtpql+cUsKRV7e8mLTubrCdpnZnAtbF2ICdO9M 9vxsX9fpNEd5R01woXqcEd19Jh2Dea3ZHtyDAOArlEuX40wCahZAKF8DeNtrSodMwa2f aA5w== X-Forwarded-Encrypted: i=1; AJvYcCVAsWSvVtgiq0b7F5fOcjb//9BnGn6UxJHklXPywnIU+S4i6xAq2gZuP2SB1bH4i07hdfmU9I0ayUdwIyHg@vger.kernel.org, AJvYcCXOb04FPGBowvGiUbYzYpz7qCpYJsmCG6ZQOQn/OWH/ykqibZIEByxNv6thKKfna3S7dLwlcyOZVXg=@vger.kernel.org X-Gm-Message-State: AOJu0YxIsGhqGddn7HcdnipT4ZyBUDUU0vHVEYwqlIEPNHcyRdLZmhXO xNVxhQwirhOAn5+i0dkjZLKwiX50THWoiSWtgFwaSs6QbNm95Z9a X-Gm-Gg: ASbGnctMRF6TL6UaKDVBkc6oC65V4BjmZeie2TDKZapy2KNF+SsWoqEu9W1UzRw1G3b J36DMP/LxK4h9S5QC1CaWgLWQCwP2vvE9ZE9YJjValYcRA5Gdzb3Vfqrfjrn0zdz2aKFt9FgzPU h0kUs7yw4E1JFV1rYDfmqASNxi9J5JYa69jlUcYffL23fJZym9QcEOtpx14iCc2QIDmSlPvPska OO8vDFTOiLq6SEJWEEp+T508NyuJxDBMDYojkN37epfWIblbNLSJAPbburv19hJOE6w X-Google-Smtp-Source: AGHT+IGzpUTf+PdyMGFAlYG5FILFZ7yZKz+uleYeo3HfOkexgjV2nVfuoZLKrOOmDZVssLq3Z0Vfhw== X-Received: by 2002:ac8:5746:0:b0:467:50d0:8869 with SMTP id d75a77b69052e-46c71004b3amr471379241cf.18.1736904400689; Tue, 14 Jan 2025 17:26:40 -0800 (PST) Received: from master-x64.sparksnet ([204.111.227.95]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46c8733130dsm59933881cf.25.2025.01.14.17.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 17:26:40 -0800 (PST) From: Peter Geis To: Heiko Stuebner Cc: zyw@rock-chips.com, kever.yang@rock-chips.com, frank.wang@rock-chips.com, william.wu@rock-chips.com, wulf@rock-chips.com, linux-rockchip@lists.infradead.org, Peter Geis , Elaine Zhang , Michael Turquette , Stephen Boyd , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v1 1/6] clk: rockchip: fix wrong clk_ref_usb3otg parent for rk3328 Date: Wed, 15 Jan 2025 01:26:22 +0000 Message-Id: <20250115012628.1035928-2-pgwipeout@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250115012628.1035928-1-pgwipeout@gmail.com> References: <20250115012628.1035928-1-pgwipeout@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Correct the clk_ref_usb3otg parent to fix clock control for the usb3 controller on rk3328. Verified against the rk3328 trm, the rk3228h trm, and the rk3328 usb3 phy clock map. Fixes: fe3511ad8a1c ("clk: rockchip: add clock controller for rk3328") Signed-off-by: Peter Geis --- drivers/clk/rockchip/clk-rk3328.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/rockchip/clk-rk3328.c b/drivers/clk/rockchip/clk-r= k3328.c index 3bb87b27b662..cf60fcf2fa5c 100644 --- a/drivers/clk/rockchip/clk-rk3328.c +++ b/drivers/clk/rockchip/clk-rk3328.c @@ -201,7 +201,7 @@ PNAME(mux_aclk_peri_pre_p) =3D { "cpll_peri", "gpll_peri", "hdmiphy_peri" }; PNAME(mux_ref_usb3otg_src_p) =3D { "xin24m", - "clk_usb3otg_ref" }; + "clk_ref_usb3otg_src" }; PNAME(mux_xin24m_32k_p) =3D { "xin24m", "clk_rtc32k" }; PNAME(mux_mac2io_src_p) =3D { "clk_mac2io_src", --=20 2.39.5 From nobody Mon Dec 15 22:06:23 2025 Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (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 737A47405A; Wed, 15 Jan 2025 01:26:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736904406; cv=none; b=T/U4gWQ82Fen1A0XEBAdvwRdvrw0eZ9mLYkxVPCWn/ZVNGQI/4AUo41bE6esWIeUvVCFxY/1lfgWqesSMtTtYap2d0Ny/f0izPGkYhAP3QTf02P2YyWm44f3OvyDpVf+3CqYrOSjVAYF3ChoWpO+gy75uFU/Mrw89ZDkhX3dUHo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736904406; c=relaxed/simple; bh=UXTMnc+dQVsthO8edzpzxnZ6ra3uqSGqSoKIEwPgdC4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TcUoBm8/WwAG1Q+MmM4r9BVuBDqE+tT40YhptBQZA7RU70ejh1cirCcM0H8hOM8+6K0b2A425Wy9+NlsrfKu2OfBjrLb+8v43nx8zJfHgzZti8Uqs9N4XE2+TtRnBCmW5H9yFu94aqrl9Eukbmo6r/mgfGxxh+eqzPw47/5/mjE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IXl5d0dw; arc=none smtp.client-ip=209.85.160.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IXl5d0dw" Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-46b1d40ac6bso3506301cf.0; Tue, 14 Jan 2025 17:26:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736904403; x=1737509203; darn=vger.kernel.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=Snarum8RemNk17GrbLyNHBNd9vFMQQrcExzWnVGfdHE=; b=IXl5d0dwBk/MJhtsCF/Mt107LSsY8gbtPwr44eVGjSCmcpgVhnZorek+7UVvgaqNYx 8s7wr+buYnIzdR/mml13Ie9Oa8xkGRJIzxiOb/CtZAU4G0MRK3lpnzNmwpldPahbUsPT ifHsF9LLkesiEn9i0NmbnecUC+Xzzo5Q6uCRP3ZkRByIxYz7Si9KW4xihKyaQ7re9Kc+ ZjQIz7qiJjef15+WJhLLqSM5tzIZsPCN+etdMUix44al4iYN5WeIp9iRtN4e6/tZkJk5 3vcB8kkYRqStBCTzbcxdlbq3dpTzmlubPKVsJSm89kbBKEoxh1F+bQPG59y1x6XG7xZ+ GcwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736904403; x=1737509203; 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=Snarum8RemNk17GrbLyNHBNd9vFMQQrcExzWnVGfdHE=; b=O/O2qA4+XiqiSYaBUPKmGdg/tWNyXtKc0SCC38LmMVCliouB6lxB/YGZH0dBgssu80 eOB9z0LuRUZRgZ5HkLBSp3iM7gs1dH7Yk3viFjmkUuR3faozlwGA5A1ssg9SH7knzb2P cvYma1R/FxlmF9Xu/dp0GJqoTC3XhdFOhfuU4OOakN/Syp/S46ARNrslR4LEqR6nTWGD WkKzI1UgQ4dNQ5yJurLxUPBbkVGLuzbLvj5kDaKLEGdLepYvwGexS/SmlusweX7kTSoi Zo5qQ4li/Hsqm/aZORPTh6SLYwAg8rsOQkwha8gWEy877rHwtsnNITv7lRYyuJHX5dHl cVdg== X-Forwarded-Encrypted: i=1; AJvYcCUbBOwOPyZtJlad6fgPOW0G8WzyY/Dy8MsdrNNGX/d6pdtiPGCZB47Yff5smfMv6ec+TjMbKipFbLYC@vger.kernel.org, AJvYcCXfC90wkzgpbV5wYRNuReybIK5y6SFKSllIliptkndgQ4/iKjILTdbYZER78UJop7LHPtBCJj5d4bxrwjHa@vger.kernel.org X-Gm-Message-State: AOJu0Yx3ynyVd2nHxb5bknRUQUQMBYHd7JPnHf/0bqPIJlh/9/9tH7Vo vJ2+2oHVzsC/iK+uoB1u3Hz+tv/RKzXjTenrfLJYvsjJCSGbRtVf X-Gm-Gg: ASbGnctrqlaa6z/X3FT+KGPth6iAt8c4pbarqXeh+nFWhexCFcNH4i5MGaaGg4xFkMf Rs2WLNTZkIc+MbcqLioNvbb6oaGgLHekDGaBimvE2W9aEOL1TQQK0cz+RJWecbTH+q1wkkH15sU h0YbYivpfLzp0nVu7MuSAYi0F8VLsYXDkyWv/M9eHVTzIqHQhrcuVDA6QneXRVRpNGRROHaLVY0 4DnUtBYCMdk1BdPNNUoG9VDkzSS8J52nlFfL4yTAjhmBIsuHkfph0fPDsz95J0soWEX X-Google-Smtp-Source: AGHT+IGOUmK+RMSPaiPxBiaoCjQrSZ5Ap13SAxkBgzinR11U70sZUt737IPnaRgevXgbi2ZEV1eQwQ== X-Received: by 2002:a05:622a:181b:b0:466:9197:b4fa with SMTP id d75a77b69052e-46df5760914mr22651911cf.21.1736904403233; Tue, 14 Jan 2025 17:26:43 -0800 (PST) Received: from master-x64.sparksnet ([204.111.227.95]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46c8733130dsm59933881cf.25.2025.01.14.17.26.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 17:26:42 -0800 (PST) From: Peter Geis To: Heiko Stuebner Cc: zyw@rock-chips.com, kever.yang@rock-chips.com, frank.wang@rock-chips.com, william.wu@rock-chips.com, wulf@rock-chips.com, linux-rockchip@lists.infradead.org, Peter Geis , Conor Dooley , Kishon Vijay Abraham I , Krzysztof Kozlowski , Rob Herring , Vinod Koul , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org Subject: [RFC PATCH v1 2/6] dt-bindings: phy: rockchip: add rk3328 usb3 phy Date: Wed, 15 Jan 2025 01:26:23 +0000 Message-Id: <20250115012628.1035928-3-pgwipeout@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250115012628.1035928-1-pgwipeout@gmail.com> References: <20250115012628.1035928-1-pgwipeout@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add documentation for the usb3 phy as implemented on the rk3328 SoC. Signed-off-by: Peter Geis --- .../bindings/phy/rockchip,inno-usb3phy.yaml | 166 ++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/rockchip,inno-usb= 3phy.yaml diff --git a/Documentation/devicetree/bindings/phy/rockchip,inno-usb3phy.ya= ml b/Documentation/devicetree/bindings/phy/rockchip,inno-usb3phy.yaml new file mode 100644 index 000000000000..cde489ca87ab --- /dev/null +++ b/Documentation/devicetree/bindings/phy/rockchip,inno-usb3phy.yaml @@ -0,0 +1,166 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/rockchip,inno-usb3phy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip USB 3.0 phy with Innosilicon IP block + +maintainers: + - Heiko Stuebner + +properties: + compatible: + enum: + - rockchip,rk3328-usb3phy + + reg: + maxItems: 1 + + clocks: + minItems: 3 + maxItems: 3 + + clock-names: + items: + - const: refclk-usb3otg + - const: usb3phy-otg + - const: usb3phy-pipe + + interrupts: + minItems: 4 + + interrupt-names: + items: + - const: bvalid + - const: id + - const: linestate + - const: rxdet + + resets: + minItems: 6 + + reset-names: + items: + - const: usb3phy-u2-por + - const: usb3phy-u3-por + - const: usb3phy-pipe-mac + - const: usb3phy-utmi-mac + - const: usb3phy-utmi-apb + - const: usb3phy-pipe-apb + + "#address-cells": + const: 2 + + "#size-cells": + const: 2 + + ranges: true + +patternProperties: + + utmi-port@[0-9a-f]+$: + type: object + additionalProperties: false + + properties: + compatible: + enum: + - rockchip,rk3328-usb3phy-utmi + + reg: + maxItems: 1 + + "#phy-cells": + const: 0 + + phy-supply: + description: + Phandle to a regulator that provides power to VBUS. + See ./phy-bindings.txt for details. + + required: + - compatible + - reg + - "#phy-cells" + + pipe-port@[0-9a-f]+$: + type: object + additionalProperties: false + + properties: + compatible: + enum: + - rockchip,rk3328-usb3phy-pipe + + reg: + maxItems: 1 + + "#phy-cells": + const: 0 + + phy-supply: + description: + Phandle to a regulator that provides power to VBUS. + See ./phy-bindings.txt for details. + + required: + - compatible + - reg + - "#phy-cells" + +required: + - compatible + - reg + - clocks + - clock-names + - interrupts + - interrupt-names + - resets + - reset-names + +additionalProperties: false + +examples: + - | + #include + #include + #include + soc { + #address-cells =3D <2>; + #size-cells =3D <2>; + + usb3phy: usb3-phy@ff460000 { + compatible =3D "rockchip,rk3328-usb3phy"; + reg =3D <0x0 0xff460000 0x0 0x10000>; + clocks =3D <&cru SCLK_REF_USB3OTG>, <&cru PCLK_USB3PHY_OTG>, <&cru= PCLK_USB3PHY_PIPE>; + clock-names =3D "refclk-usb3otg", "usb3phy-otg", "usb3phy-pipe"; + interrupts =3D , , + , ; + interrupt-names =3D "bvalid", "id", "linestate", "rxdet"; + resets =3D <&cru SRST_USB3PHY_U2>, + <&cru SRST_USB3PHY_U3>, + <&cru SRST_USB3PHY_PIPE>, + <&cru SRST_USB3OTG_UTMI>, + <&cru SRST_USB3PHY_OTG_P>, + <&cru SRST_USB3PHY_PIPE_P>; + reset-names =3D "usb3phy-u2-por", "usb3phy-u3-por", + "usb3phy-pipe-mac", "usb3phy-utmi-mac", + "usb3phy-utmi-apb", "usb3phy-pipe-apb"; + #address-cells =3D <2>; + #size-cells =3D <2>; + ranges; + + usb3phy_utmi: utmi-port@ff470000 { + compatible =3D "rockchip,rk3328-usb3phy-utmi"; + reg =3D <0x0 0xff470000 0x0 0x8000>; + #phy-cells =3D <0>; + }; + + usb3phy_pipe: pipe-port@ff478000 { + compatible =3D "rockchip,rk3328-usb3phy-pipe"; + reg =3D <0x0 0xff478000 0x0 0x8000>; + #phy-cells =3D <0>; + }; + }; + }; --=20 2.39.5 From nobody Mon Dec 15 22:06:23 2025 Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) (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 67CC64F8A0 for ; Wed, 15 Jan 2025 01:26:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736904410; cv=none; b=rEX6sZSclvBp+Tb/3dYAi/qwdHSKY3BPZChd0dl/hJXWbL4BxCvof+ACoij1wPFJ+xWaC9Orf2t7apbYT29xowGxNkhxObaMuUI1gSRL0VIzLAlAJlgxf62Ui1LEiTHWL2enmUwFX3Nd2M2djWzyqUacjQWnq/0qrizSsSXWUHI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736904410; c=relaxed/simple; bh=bJv4BqWSZZyxcM9eJ4vg9PkP2nKB2r/KfnmAaaTUy5s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=M+e/Etkf4Lt4z1iWyz4kjlUkNz2/6uugrRaCL/voKpeBFdAJTakQAYqv1MCuv26AdB25t1o0WNdN930NN2/fOQxBMvg9E+Vnc/1aEumGtNXJKzH6xfLN4opZWGsWWzG6KqfdAwMz+OQqSjFWAs7xSHquWtu5+aibTQrDyb7uNBk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=L+qsE1PW; arc=none smtp.client-ip=209.85.219.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="L+qsE1PW" Received: by mail-qv1-f43.google.com with SMTP id 6a1803df08f44-6d89a727a19so3906576d6.0 for ; Tue, 14 Jan 2025 17:26:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736904406; x=1737509206; darn=vger.kernel.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=TSu2ilieqgUO5zKTRGeUD5qv6+cUUmQ28sg6xpl/Ysk=; b=L+qsE1PWXsCV1vV4LlJe3g4PKimpXULUo3zMa2+NQb5jBh4tXGNHaprB3njAMABjRI p8wzy60PwmGzBZkQ3VH1ahwmA1UT/CJoAEeXZA7ZNLDFWTbEEPI9ygZfinA4k3fL6/rO bId/ape2rl5051Zn4PFr/udNoRLHA3tDOXznxH42sVJQO5YllAc7a+en4CeJN3l0w4v6 RN3/b881bEDqSbS5Jxyz6F8wGO4w18jYabm/YFzepiBK3JHvYT8HGze8p/BIy3I3epX1 +EmtPxBfz5CZVTS54fAt5RKqEQyvhO0s1JdqAji3c316nCs89lJAZInMMG0I4wPCFyKG XQpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736904406; x=1737509206; 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=TSu2ilieqgUO5zKTRGeUD5qv6+cUUmQ28sg6xpl/Ysk=; b=J9T40WM6FJYniPRNuDZu9cDEkJLAuj3fvZcQPOG6OBfaabCfymjFhW3JyapbEwStpx fNVHh5pDUAbj7jkhr+srAG7beumCwsYwV/jaRuEnIpjE/rwvrcXvE7m+tN16D9pnZi0o OJ2tWFjga2wmQgX3x9x4FVuIRenCf7gdb4gub7eEw8qVmrcLoDZwv1zVHuQJ4ZOvzUZJ T0SiAEWV5sImoV61EH+b31Dq9OGohHjYq8EqjudGkye+ixgayYxNsggPjoaMB0feeXen iJKqaO4Ei0yZ3lW/EdUlwTjyKUq+F+Nnug647gLhZYNXT0BX5TJolkuXAwT3ez4ieuxT PilQ== X-Forwarded-Encrypted: i=1; AJvYcCVOxLaTy+jarAOEkwV2PPJvv8Ad+9qNDnfFUjt1vLxMY2OvwXcmPcAO4XlkY/iSDMmjGBHCBPHpoGnV0z8=@vger.kernel.org X-Gm-Message-State: AOJu0YzshIdAW7PnxV3FrPtT9z6mAgsQEsCm8PAd14g0q6omoBoOK7vC k1tlrwN7+LsWFdRuhGaLcR+d1PjJ8xubTtmcFczwS8zJYIp0qp2axuPCh8hI X-Gm-Gg: ASbGncvDigJvRf6OufeotLOd0MPqWp9Uq/qbUBUMXTeRBhVpLlYnuOckxMPMisO4STy /rxxt1XtEDyHuU7Il7R4zEenSuiUYK1IEWPk9dz2Fb2N6jiyX/2d35zRzgW1mJtyg2AeSvy4F3r Puo9DIVRVNZ2Ix6pJNipYAm1ceZOeijCEF3CCisIkTTnMEsgsNk5yyTGe4jhwSoAqVxK1BH/ag+ w9zKKX94aT9nxLPYII1Zg+tjZYc39tTEbvqbJlNfco4V+Xf0mukHN6B6Ii/36MMzpT7 X-Google-Smtp-Source: AGHT+IGx11grCIzrhEM4SMHaq84/7LtIocdm3qvr8pA/OIlL6tsAfWKasVwNac41UogFfWfziivrKA== X-Received: by 2002:a05:6214:4d83:b0:6d8:99cf:d2d0 with SMTP id 6a1803df08f44-6e192cb7ecfmr18890756d6.19.1736904406049; Tue, 14 Jan 2025 17:26:46 -0800 (PST) Received: from master-x64.sparksnet ([204.111.227.95]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46c8733130dsm59933881cf.25.2025.01.14.17.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 17:26:44 -0800 (PST) From: Peter Geis To: Heiko Stuebner Cc: zyw@rock-chips.com, kever.yang@rock-chips.com, frank.wang@rock-chips.com, william.wu@rock-chips.com, wulf@rock-chips.com, linux-rockchip@lists.infradead.org, Peter Geis , Algea Cao , Arnd Bergmann , Cristian Ciocaltea , Kishon Vijay Abraham I , Philipp Zabel , Sebastian Reichel , Vinod Koul , Zhang Yubing , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org Subject: [RFC PATCH v1 3/6] phy: rockchip: add driver for rk3328 usb3 phy Date: Wed, 15 Jan 2025 01:26:24 +0000 Message-Id: <20250115012628.1035928-4-pgwipeout@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250115012628.1035928-1-pgwipeout@gmail.com> References: <20250115012628.1035928-1-pgwipeout@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The rk3328 has a combined usb2 and usb3 phy block for the usb3 dwc interface. The implementation up until now has been bugged, with multiple issues ranging from disconnect detection failures to low performance. This driver fixes the majority of the original issues and allows better performance for the rk3328 usb3 port. This driver sources data from multiple sources, including the rk3328 trm, the rk3228h trm, emails from Rockchip, and both the 4.4 and 5.10 downstream drivers. The current implementation allows for basic bring up of the phy block and fixes the detection issues. Interrupts are enabled, but currently only used for debugging. Features missing currently are power management, OTG handling, board specific tuning, regulator control, Currently the only known bugs are a AX88179 usb3 gigabit adapter crashes when operating at usb3 speeds and transmitting large amounts of data and full disconnection detections may be slower than expected (~5-10 seconds). Signed-off-by: Peter Geis --- drivers/phy/rockchip/Kconfig | 10 + drivers/phy/rockchip/Makefile | 1 + drivers/phy/rockchip/phy-rockchip-inno-usb3.c | 869 ++++++++++++++++++ 3 files changed, 880 insertions(+) create mode 100644 drivers/phy/rockchip/phy-rockchip-inno-usb3.c diff --git a/drivers/phy/rockchip/Kconfig b/drivers/phy/rockchip/Kconfig index 2f7a05f21dc5..aac623e84f96 100644 --- a/drivers/phy/rockchip/Kconfig +++ b/drivers/phy/rockchip/Kconfig @@ -48,6 +48,16 @@ config PHY_ROCKCHIP_INNO_USB2 help Support for Rockchip USB2.0 PHY with Innosilicon IP block. =20 +config PHY_ROCKCHIP_INNO_USB3 + tristate "Rockchip INNO USB3PHY Driver" + depends on (ARCH_ROCKCHIP || COMPILE_TEST) && OF + depends on COMMON_CLK + depends on USB_SUPPORT + select GENERIC_PHY + select USB_COMMON + help + Support for Rockchip USB3.0 PHY with Innosilicon IP block. + config PHY_ROCKCHIP_INNO_CSIDPHY tristate "Rockchip Innosilicon MIPI CSI PHY driver" depends on (ARCH_ROCKCHIP || COMPILE_TEST) && OF diff --git a/drivers/phy/rockchip/Makefile b/drivers/phy/rockchip/Makefile index 010a824e32ce..ec15dcf37fba 100644 --- a/drivers/phy/rockchip/Makefile +++ b/drivers/phy/rockchip/Makefile @@ -6,6 +6,7 @@ obj-$(CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY) +=3D phy-rockchip-i= nno-csidphy.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY) +=3D phy-rockchip-inno-dsidphy.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_HDMI) +=3D phy-rockchip-inno-hdmi.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB2) +=3D phy-rockchip-inno-usb2.o +obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB3) +=3D phy-rockchip-inno-usb3.o obj-$(CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY) +=3D phy-rockchip-naneng-combp= hy.o obj-$(CONFIG_PHY_ROCKCHIP_PCIE) +=3D phy-rockchip-pcie.o obj-$(CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX) +=3D phy-rockchip-samsung-hdptx.o diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb3.c b/drivers/phy/ro= ckchip/phy-rockchip-inno-usb3.c new file mode 100644 index 000000000000..51b9f3b7fbfa --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb3.c @@ -0,0 +1,869 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/* + * phy-rockchip-inno-usb3.c - USB3 PHY based on Innosilicon IP as + * implemented on Rockchip rk3328. Tuning data magic bits are taken as is + * from the downstream driver. Downstream driver is located at: + * https://github.com/rockchip-linux/kernel/blob/240a5660d7c23841ccf7b7cc4= 89078bf521b9802/drivers/phy/rockchip/phy-rockchip-inno-usb3.c + * + * Author: Peter Geis + * TODO: + * - Find the rest of the register names / definitions. + * - Implement pm functions. + * - Implement board specific tuning from dts. + * - Implement regulator control. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define REG_WRITE_MASK GENMASK(31, 16) +#define REG_WRITE_SHIFT 16 +#define DISABLE_BITS 0x0 + +/* USB3PHY GRF Registers */ +#define USB3PHY_WAKEUP_CON_REG 0x40 +#define USB3PHY_WAKEUP_STAT_REG 0x44 +#define USB3_LINESTATE_IRQ_EN BIT(0) +#define USB3_RXDET_IRQ_EN BIT(1) +#define USB3_BVALID_RISE_IRQ_EN BIT(2) +#define USB3_BVALID_FALL_IRQ_EN BIT(3) +#define USB3_BVALID_CLEAR_MASK GENMASK(3, 2) +#define USB3_ID_RISE_IRQ_EN BIT(4) +#define USB3_ID_FALL_IRQ_EN BIT(5) +#define USB3_ID_CLEAR_MASK GENMASK(5, 4) +#define USB3_RXDET_EN BIT(6) + +/* PIPE registers */ +/* 0x08 for SSC, default 0x0e */ +#define UNKNOWN_PIPE_REG_000 0x000 +#define UNKNOWN_SSC_000_MASK GENMASK(2, 1) +#define UNKNOWN_SSC_000_ENABLE (0x00 << 1) + +/* 0x83 for 24m, 0x01 for 25m, default 0x86 */ +#define PIPE_REG_020 0x020 +/* RX CDR multiplier high bits [7:6], as P, default 0x2, RX data rate =3D = (2*refclk*P)/Q */ +#define PIPE_RX_CDR_MULT_HIGH_MASK GENMASK(7, 6) +/* TX PLL divider bits [4:0], as N, default 0x6, TX data rate =3D (2*refcl= k*M)/N */ +#define PIPE_TX_PLL_DIV_MASK GENMASK(4, 0) + +/* 0x71 for 24m, 0x64 for 25m, default 0x71 */ +#define PIPE_REG_028 0x028 +/* RX CDR multiplier low bits [7:0], as P, default 0x71, RX data rate =3D = (2*refclk*P)/Q */ +#define PIPE_RX_CDR_MULT_LOW_MASK GENMASK(7, 0) + +/* 0x26 for 24m?, 0x21 for 25m, default 0x26 */ +#define PIPE_REG_030 0x030 +/* RX CDR divider bits [4:0], as Q, default 0x6, RX data rate =3D (2*refcl= k*P)/Q */ +#define PIPE_RX_CDR_DIV_MASK GENMASK(4, 0) + +/* 1'b1 Disable bandgap power, default 0x00 */ +#define PIPE_REG_044 0x044 +#define BANDGAP_POWER_DISABLE BIT(4) + +/* 0xe0 for rx tune?, default 0xe1 */ +#define PIPE_REG_060 0x060 +#define PIPE_TX_DETECT_BYPASS_DEBUG BIT(4) /* enable to always force dete= ction */ +/* RX CTLE frequency bandwidth response tuning bits [1:0], default 0x1 */ +#define PIPE_RX_CTLE_FREQ_BW_MASK GENMASK(1, 0) +#define PIPE_RX_CTLE_FREQ_BW_TUNE 0x0 + +/* default 0x49 */ +#define PIPE_REG_064 0x064 +/* RX equalizer tail current control bits [6:4], default 0x4 */ +#define PIPE_RX_EQ_TAIL_CURR_MASK GENMASK(6, 4) + +/* 0x08 for rx tune?, default 0x07 */ +#define PIPE_REG_068 0x068 +/* RX equalizer low frequency gain control bits [7:4], default 0x0 */ +#define PIPE_RX_EQ_LOW_GAIN_MASK GENMASK(7, 4) +#define PIPE_RX_EQ_LOW_GAIN_TUNE (0x1 << 4) +/* RX CTLE gain tuning bits [3:0], higher =3D more gain default 0x7 */ +#define PIPE_RX_CTLE_GAIN_MASK GENMASK(3, 0) +#define PIPE_RX_CTLE_GAIN_TUNE 0x7 /* 0x5 lowest functional value, 0xf h= ighest */ + +/* RX ODT manual resistance config, higher =3D less resistance, depends on= REG_1C4 BIT(5) set */ +#define PIPE_REG_06C 0x06c +/* RX ODT manual resistance high bits [3:0], default 0x0 */ +#define PIPE_RX_ODT_RES_HIGH_MASK GENMASK(3, 0) +#define PIPE_RX_ODT_RES_HIGH_TUNE 0xf + +#define PIPE_REG_070 0x070 +/* RX ODT manual resistance mid bits [7:0], default 0x03 */ +#define PIPE_RX_ODT_RES_MID_MASK GENMASK(7, 0) +#define PIPE_RX_ODT_RES_MID_TUNE 0xff + +#define PIPE_REG_074 0x074 +/* RX ODT manual resistance low bits [7:0], default 0xff */ +#define PIPE_RX_ODT_RES_LOW_MASK GENMASK(7, 0) +#define PIPE_RX_ODT_RES_LOW_TUNE 0xff + +/* default 0x08 */ +#define PIPE_REG_080 0x080 +#define PIPE_TX_COMMON_MODE_DIS BIT(2) /* 1'b1 disable TX common type */ + +/* default 0x33 */ +#define PIPE_REG_088 0x088 +#define PIPE_TX_DRIVER_PREEMP_EN BIT(4) /* 1'b1 enable pre-emphasis */ + +/* default 0x18 */ +#define PIPE_REG_0C0 0x0c0 +#define PIPE_RX_CM_EN BIT(3) /* 1'b1 enable RX CM */ +#define PIPE_TX_OBS_EN BIT(4) /* 1'b1 enable TX OBS */ + +/* 0x12 for rx tune?, default 0x14 */ +#define PIPE_REG_0C8 0x0c8 +/* RX CDR charge pump current bits [3:1], default 0x2 */ +#define PIPE_RX_CDR_CHG_PUMP_MASK GENMASK(3, 1) +#define PIPE_RX_CDR_CHG_PUMP_TUNE (0x2 << 1) + +/* 0x02 for 24m, 0x06 for 25m, default 0x06 */ +#define UNKNOWN_PIPE_REG_108 0x108 +#define UNKNOWN_REFCLK_108_24M 0x02 + +/* 0x80 for 24m, default 0x00 */ +#define UNKNOWN_PIPE_REG_10C 0x10c +#define UNKNOWN_REFCLK_10C_24M BIT(7) + +/* 0x01 for 24m, 0x00 for 25m, default 0x02 */ +#define PIPE_REG_118 0x118 +/* TX PLL multiplier high bits [3:0], as M, default 0x2, TX data rate =3D = (2*refclk*M)/N */ +#define PIPE_TX_PLL_MUL_HIGH_MASK GENMASK(3, 0) + +/* 0x38 for 24m, 0x64 for 25m, default 0x71 */ +#define PIPE_REG_11C 0x11c +/* TX PLL multiplier low bits [7:0], as M, default 0x71, TX data rate =3D = (2*refclk*M)/N */ +#define PIPE_TX_PLL_MUL_LOW_MASK GENMASK(7, 0) + +/* 0x0c for SSC, default 0x1c */ +#define UNKNOWN_PIPE_REG_120 0x120 +#define UNKNOWN_SSC_120_MASK BIT(4) +#define UNKNOWN_SSC_120_ENABLE (0x0 << 4) + +/* default 0x40 */ +#define PIPE_REG_12C 0x12c +#define PIPE_TX_PLL_ALWAYS_ON BIT(0) /* disable for PLL control by pipe_= pd */ + +/* 0x05 for rx tune, default 0x01 */ +#define PIPE_REG_148 0x148 +#define PIPE_RX_CHG_PUMP_DIV_2 BIT(2) /* RX CDR charge pump div/2, defau= lt 0 */ + +/* 0x70 for rx tune, default 0x72 */ +#define PIPE_REG_150 0x150 +#define PIPE_TX_BIAS_EN BIT(6) /* 1'b1 Enable TX Bias */ +/* RX CDR phase tracking speed bits [3:0], default 0x2 */ +#define PIPE_RX_CDR_SPEED_MASK GENMASK(3, 0) +#define PIPE_RX_CDR_SPEED_TUNE 0x00 + +/* default 0xd4 */ +#define PIPE_REG_160 +/* RX common mode voltage strength bits [5:4], default 0x1 */ +#define PIPE_RX_CDR_COM_VOLT_MASK GENMASK(5, 4) +#define PIPE_RX_CDR_COM_VOLT_TUNE (0x1 << 4) + +/* default 0x00 */ +#define PIPE_REG_180 0x180 +/* TX driver bias reference voltage bits [3:2], in mv */ +#define PIPE_TX_BIAS_REF_VOLT_MASK GENMASK(3, 2) +#define PIPE_TX_BIAS_REF_VOLT_200 (0x0 << 2) +#define PIPE_TX_BIAS_REF_VOLT_175 (0x1 << 2) +#define PIPE_TX_BIAS_REF_VOLT_225 (0x2 << 2) /* downstream 5.10 driver se= tting */ +#define PIPE_TX_BIAS_REF_VOLT_250 (0x3 << 2) + +/* default 0x01 */ +#define PIPE_REG_1A8 0x1a8 +#define PIPE_LDO_POWER_DIS BIT(4) /* 1'b1 Disable LDO Power */ + +/* default 0x07 */ +#define PIPE_REG_1AC 0x1ac +/* TX driver output common voltage bits [5:4], in mv */ +#define PIPE_TX_COMMON_VOLT_MASK GENMASK(5, 4) +#define PIPE_TX_COMMON_VOLT_800 (0x0 << 4) +#define PIPE_TX_COMMON_VOLT_750 (0x1 << 4) +#define PIPE_TX_COMMON_VOLT_950 (0x2 << 4) +#define PIPE_TX_COMMON_VOLT_1100 (0x3 << 4) + +/* default 0xfb */ +#define PIPE_REG_1B8 0x1b8 +/* TX driver swing strength bits [7:4], range 0x0 to 0xf */ +#define PIPE_TX_DRIVER_SWING_MASK GENMASK(7, 4) /* 0x2 lowest functional = value */ +/* TX driver pre-emphasis strength bits [1:0], default 0x3, enabled by REG= 088 */ +#define PIPE_TX_DRIVER_PREEMP_STR_MASK GENMASK(1, 0) + +/* set to 0xf0 for rx tune?, default 0xd0 */ +#define PIPE_REG_1C4 0x1c4 +#define PIPE_RX_ODT_AUTO_DIS BIT(5) /* Disable RX ODT auto compensation = */ +#define PIPE_TX_ODT_AUTO_DIS BIT(3) /* Disable TX ODT auto compensation = */ + +/* UTMI registers */ +/* 0x0f for utmi tune, default 0x09*/ +#define UTMI_REG_030 0x030 +/* {bits[2:0]=3D111}: always enable pre-emphasis */ +#define UTMI_ENABLE_PRE_EMPH_MASK GENMASK(2, 0) +#define UTMI_ENABLE_PRE_EMPH 0x07 + +/* 0x41 for utmi tune, default 0x49 */ +#define UTMI_REG_040 0x040 +/* TX HS pre-emphasis strength bits [5:3], default 0x1*/ +#define UTMI_TX_PRE_EMPH_STR_MASK GENMASK(5, 3) +#define UTMI_TX_PRE_EMPH_WEAKEST (0x0 << 3) + +/* set to 0xb5 for utmi tune, default 0xb5 */ +#define UTMI_REG_11C 0x11c +/* {bits[4:0]=3D10101}: odt 45ohm tuning */ +#define UTMI_ODT_45_OHM_MASK GENMASK(4, 0) +#define UTMI_ODT_45_OHM_TUNE 0x15 + +enum rockchip_usb3phy_type { + USB3PHY_TYPE_USB2, + USB3PHY_TYPE_USB3, + USB3PHY_TYPE_MAX, +}; + +/** + * struct rockchip_usb3phy_port - usb-phy port data. + * @phy: port usb phy struct. + * @regmap: port regmap. + * @type: port usb phy type. + */ +struct rockchip_usb3phy_port { + struct phy *phy; + struct regmap *regmap; + enum rockchip_usb3phy_type type; +}; + +struct rockchip_usb3phy { + struct device *dev; + struct regmap *regmap; + struct clk *clk_pipe; + struct clk *clk_otg; + struct clk *clk_ref; + struct reset_control *u3por_rst; + struct reset_control *u2por_rst; + struct reset_control *pipe_rst; + struct reset_control *utmi_rst; + struct reset_control *pipe_apb_rst; + struct reset_control *utmi_apb_rst; + struct rockchip_usb3phy_port ports[USB3PHY_TYPE_MAX]; + int bvalid_irq; + int id_irq; + int ls_irq; + int rxdet_irq; +}; + +struct usb3phy_config { + unsigned int reg; + unsigned int mask; + u8 def; +}; + +static const struct usb3phy_config rk3328_rx_config[] =3D { + { PIPE_REG_150, PIPE_RX_CDR_SPEED_MASK, PIPE_RX_CDR_SPEED_TUNE }, + { PIPE_REG_0C8, PIPE_RX_CDR_CHG_PUMP_MASK, PIPE_RX_CDR_CHG_PUMP_TUNE }, + { PIPE_REG_148, PIPE_RX_CHG_PUMP_DIV_2, PIPE_RX_CHG_PUMP_DIV_2 }, + { PIPE_REG_068, PIPE_RX_CTLE_GAIN_MASK, PIPE_RX_CTLE_GAIN_TUNE }, +// { PIPE_REG_1C4, PIPE_RX_ODT_AUTO_DIS, PIPE_RX_ODT_AUTO_DIS }, + { PIPE_REG_070, PIPE_RX_ODT_RES_MID_MASK, PIPE_RX_ODT_RES_MID_TUNE }, + { PIPE_REG_06C, PIPE_RX_ODT_RES_HIGH_MASK, PIPE_RX_ODT_RES_HIGH_TUNE }, + { PIPE_REG_060, PIPE_RX_CTLE_FREQ_BW_MASK, PIPE_RX_CTLE_FREQ_BW_TUNE }, + { UNKNOWN_PIPE_REG_10C, UNKNOWN_REFCLK_10C_24M, UNKNOWN_REFCLK_10C_24M }, + { PIPE_REG_060, PIPE_RX_CTLE_FREQ_BW_MASK, PIPE_RX_CTLE_FREQ_BW_TUNE }, + { PIPE_REG_068, PIPE_RX_EQ_LOW_GAIN_MASK, PIPE_RX_EQ_LOW_GAIN_TUNE }, +}; + +static const struct usb3phy_config rk3328_tx_config[] =3D { + { PIPE_REG_180, PIPE_TX_BIAS_REF_VOLT_MASK, PIPE_TX_BIAS_REF_VOLT_250 }, +}; + +static const struct usb3phy_config rk3328_ssc_config[] =3D { + { UNKNOWN_PIPE_REG_000, UNKNOWN_SSC_000_MASK, UNKNOWN_SSC_000_ENABLE }, + { UNKNOWN_PIPE_REG_120, UNKNOWN_SSC_120_MASK, UNKNOWN_SSC_120_ENABLE }, +}; + +static const struct usb3phy_config rk3328_utmi_config[] =3D { + { UTMI_REG_030, UTMI_ENABLE_PRE_EMPH_MASK, UTMI_ENABLE_PRE_EMPH }, + { UTMI_REG_040, UTMI_TX_PRE_EMPH_STR_MASK, UTMI_TX_PRE_EMPH_WEAKEST }, + { UTMI_REG_11C, UTMI_ODT_45_OHM_MASK, UTMI_ODT_45_OHM_TUNE }, +}; + +static const struct usb3phy_config rk3328_pipe_pwr_en_config[] =3D { + { PIPE_REG_1A8, PIPE_LDO_POWER_DIS, DISABLE_BITS }, + { PIPE_REG_044, BANDGAP_POWER_DISABLE, DISABLE_BITS }, + { PIPE_REG_150, PIPE_TX_BIAS_EN, PIPE_TX_BIAS_EN }, + { PIPE_REG_080, PIPE_TX_COMMON_MODE_DIS, DISABLE_BITS }, + { PIPE_REG_0C0, PIPE_TX_OBS_EN, PIPE_TX_OBS_EN }, + { PIPE_REG_0C0, PIPE_RX_CM_EN, PIPE_RX_CM_EN }, +}; + +static int rockchip_usb3phy_reset(struct rockchip_usb3phy *usb3phy, + bool reset, enum rockchip_usb3phy_type type) +{ + if (reset) { + if (type =3D=3D USB3PHY_TYPE_USB2) { + clk_disable_unprepare(usb3phy->clk_otg); + reset_control_assert(usb3phy->utmi_rst); + reset_control_assert(usb3phy->u2por_rst); + } + if (type =3D=3D USB3PHY_TYPE_USB3) { + clk_disable_unprepare(usb3phy->clk_pipe); + reset_control_assert(usb3phy->pipe_rst); + reset_control_assert(usb3phy->u3por_rst); + } + } else { + if (type =3D=3D USB3PHY_TYPE_USB2) { + reset_control_deassert(usb3phy->u2por_rst); + fsleep(1000); + clk_prepare_enable(usb3phy->clk_otg); + fsleep(500); + reset_control_deassert(usb3phy->utmi_rst); + fsleep(100); + } + if (type =3D=3D USB3PHY_TYPE_USB3) { + reset_control_deassert(usb3phy->u3por_rst); + fsleep(500); + clk_prepare_enable(usb3phy->clk_pipe); + fsleep(1000); + reset_control_deassert(usb3phy->pipe_rst); + fsleep(100); + } + } + return 0; +} + +static irqreturn_t rockchip_usb3phy_linestate_irq(int irq, void *data) +{ + struct rockchip_usb3phy *usb3phy =3D data; + int tmp; + + /* check if the interrupt is enabled */ + regmap_read(usb3phy->regmap, USB3PHY_WAKEUP_CON_REG, &tmp); + if (!(tmp & USB3_LINESTATE_IRQ_EN)) { + dev_warn(usb3phy->dev, "invalid linestate irq received\n"); + return IRQ_NONE; + } + + regmap_read(usb3phy->regmap, USB3PHY_WAKEUP_STAT_REG, &tmp); + if (tmp & USB3_LINESTATE_IRQ_EN) + dev_dbg_ratelimited(usb3phy->dev, "linestate irq received\n"); + + /* clear the interrupt */ + regmap_write(usb3phy->regmap, USB3PHY_WAKEUP_STAT_REG, USB3_LINESTATE_IRQ= _EN); + + return IRQ_HANDLED; +} + +static irqreturn_t rockchip_usb3phy_bvalid_irq(int irq, void *data) +{ + struct rockchip_usb3phy *usb3phy =3D data; + int tmp; + + /* check if the interrupt is enabled */ + regmap_read(usb3phy->regmap, USB3PHY_WAKEUP_CON_REG, &tmp); + if (!((tmp & USB3_BVALID_FALL_IRQ_EN) | (tmp & USB3_BVALID_RISE_IRQ_EN)))= { + dev_warn_ratelimited(usb3phy->dev, "invalid bvalid irq received\n"); + return IRQ_NONE; + } + + regmap_read(usb3phy->regmap, USB3PHY_WAKEUP_STAT_REG, &tmp); + if (tmp & USB3_BVALID_FALL_IRQ_EN) + dev_dbg(usb3phy->dev, "bvalid falling irq received\n"); + if (tmp & USB3_BVALID_RISE_IRQ_EN) + dev_dbg(usb3phy->dev, "bvalid rising irq received\n"); + + /* clear the interrupt */ + regmap_write(usb3phy->regmap, USB3PHY_WAKEUP_STAT_REG, USB3_BVALID_CLEAR_= MASK); + + return IRQ_HANDLED; +} + +static irqreturn_t rockchip_usb3phy_id_irq(int irq, void *data) +{ + struct rockchip_usb3phy *usb3phy =3D data; + int tmp; + + /* check if the interrupt is enabled */ + regmap_read(usb3phy->regmap, USB3PHY_WAKEUP_CON_REG, &tmp); + if (!((tmp & USB3_ID_FALL_IRQ_EN) | (tmp & USB3_ID_RISE_IRQ_EN))) { + dev_warn(usb3phy->dev, "invalid id irq received\n"); + return IRQ_NONE; + } + + regmap_read(usb3phy->regmap, USB3PHY_WAKEUP_STAT_REG, &tmp); + if (tmp & USB3_ID_FALL_IRQ_EN) + dev_dbg(usb3phy->dev, "id falling irq received\n"); + if (tmp & USB3_ID_RISE_IRQ_EN) + dev_dbg(usb3phy->dev, "id rising irq received\n"); + + /* clear the interrupt */ + regmap_write(usb3phy->regmap, USB3PHY_WAKEUP_STAT_REG, USB3_ID_CLEAR_MASK= ); + + return IRQ_HANDLED; +} + +static irqreturn_t rockchip_usb3phy_rxdet_irq(int irq, void *data) +{ + struct rockchip_usb3phy *usb3phy =3D data; + int tmp; + + /* check if the interrupt is enabled */ + regmap_read(usb3phy->regmap, USB3PHY_WAKEUP_CON_REG, &tmp); + if (!(tmp & USB3_RXDET_IRQ_EN)) { + dev_warn(usb3phy->dev, "invalid rxdet irq received\n"); + return IRQ_NONE; + } + + regmap_read(usb3phy->regmap, USB3PHY_WAKEUP_STAT_REG, &tmp); + if (tmp & USB3_RXDET_IRQ_EN) + dev_dbg_ratelimited(usb3phy->dev, "rxdet irq received\n"); + + /* clear the interrupt */ + regmap_write(usb3phy->regmap, USB3PHY_WAKEUP_STAT_REG, USB3_RXDET_IRQ_EN); + + return IRQ_HANDLED; +} + +static int rockchip_usb3phy_bulk_update(struct rockchip_usb3phy *usb3phy, = struct regmap *regmap, + const struct usb3phy_config *config, unsigned int size) +{ + unsigned int i, val, tmp; + int ret =3D 0; + + for (i =3D 0; i < size; i++) { + ret =3D regmap_read(regmap, config[i].reg, &val); + if (ret < 0) { + dev_err(usb3phy->dev, "failed to read addr: 0x%02x\n", config[i].reg); + return ret; + } + tmp =3D val & ~config[i].mask; + tmp |=3D config[i].def; + dev_dbg(usb3phy->dev, "write: 0x%03x old: 0x%02x new: 0x%02x\n", + config[i].reg, val, tmp); + ret =3D regmap_write(regmap, config[i].reg, tmp); + if (ret < 0) { + dev_err(usb3phy->dev, "failed to write addr: 0x%02x\n", config[i].reg); + return ret; + } + } + + return ret; +} + +static int rockchip_usb3phy_calc_rate(struct rockchip_usb3phy *usb3phy, st= ruct regmap *regmap) +{ + long rate; + unsigned int mul, div, target =3D (5000000000 / 100000); + + rate =3D clk_get_rate(usb3phy->clk_ref) / 100000; + if (rate < 0) { + dev_err(usb3phy->dev, "failed to get refclk, %ld\n", rate); + return rate; + /* lowest possible supported clock is 4.8MHZ, highest rk3328 can do is 1.= 6GHZ */ + } else if ((rate < 48) | (rate > 16000)) { + goto error; + } + + for (div =3D 1; div < 32; div++) { + for (mul =3D 1; mul < 1024; mul++) { + if (((2 * rate * mul) / div) =3D=3D target) + goto done; + if (((2 * rate * mul) / div) > target) + break; + } + } + +error: + dev_err(usb3phy->dev, "invalid refclock rate, %ld\n", rate * 100000); + return -EINVAL; + +done: + dev_dbg(usb3phy->dev, "refclk rate mul: %x div: %x rate: %ld\n", mul, div= , (rate * 100000)); + + regmap_write(regmap, PIPE_REG_020, (mul >> 2) & PIPE_RX_CDR_MULT_HIGH_MAS= K); + regmap_write(regmap, PIPE_REG_020, div & PIPE_TX_PLL_DIV_MASK); + regmap_write(regmap, PIPE_REG_028, mul & PIPE_RX_CDR_MULT_LOW_MASK); + regmap_write(regmap, PIPE_REG_030, div & PIPE_RX_CDR_DIV_MASK); + regmap_write(regmap, PIPE_REG_118, (mul >> 8) & PIPE_TX_PLL_MUL_HIGH_MASK= ); + regmap_write(regmap, PIPE_REG_11C, mul & PIPE_TX_PLL_MUL_LOW_MASK); + + return 0; +} + +static int rockchip_usb3phy_init(struct phy *phy) +{ + struct rockchip_usb3phy_port *port =3D phy_get_drvdata(phy); + struct rockchip_usb3phy *usb3phy =3D dev_get_drvdata(phy->dev.parent); + int tmp, ret; + + dev_warn(usb3phy->dev, "usb3phy_init %s\n", dev_name(&phy->dev)); + clk_prepare_enable(usb3phy->clk_ref); + rockchip_usb3phy_reset(usb3phy, false, port->type); + + if (port->type =3D=3D USB3PHY_TYPE_USB2) { + /* + * "For RK3328 SoC, pre-emphasis and pre-emphasis strength must be + * written as one fixed value. The ODT 45ohm value should be tuned + * for different boards to adjust HS eye height." + */ + dev_dbg(usb3phy->dev, "tuning UTMI\n"); + ret =3D rockchip_usb3phy_bulk_update(usb3phy, port->regmap, rk3328_utmi_= config, + ARRAY_SIZE(rk3328_utmi_config)); + } + + if (port->type =3D=3D USB3PHY_TYPE_USB3) { + /* Enable interrupts */ + tmp =3D (USB3_LINESTATE_IRQ_EN | USB3_ID_FALL_IRQ_EN | USB3_ID_RISE_IRQ_= EN | + USB3_RXDET_IRQ_EN | USB3_BVALID_RISE_IRQ_EN | USB3_BVALID_FALL_IRQ_EN); + tmp |=3D (tmp << REG_WRITE_SHIFT); + + ret =3D regmap_write(usb3phy->regmap, USB3PHY_WAKEUP_CON_REG, tmp); + if (ret < 0) { + /* interrupt write determines if we have write access */ + dev_err(usb3phy->dev, "failed to write interrupts\n"); + return ret; + } + + /* Configure for 24M ref clk */ + dev_dbg(usb3phy->dev, "setting pipe for 24M refclk\n"); + if (rockchip_usb3phy_calc_rate(usb3phy, usb3phy->regmap)) + return -EINVAL; + + /* Enable SSC */ + udelay(3); + dev_dbg(usb3phy->dev, "setting pipe for SSC\n"); + ret =3D rockchip_usb3phy_bulk_update(usb3phy, port->regmap, rk3328_ssc_c= onfig, + ARRAY_SIZE(rk3328_ssc_config)); + + /* "Tuning RX for compliance RJTL test" */ + dev_dbg(usb3phy->dev, "setting pipe for RX tuning\n"); + ret =3D rockchip_usb3phy_bulk_update(usb3phy, port->regmap, rk3328_rx_co= nfig, + ARRAY_SIZE(rk3328_rx_config)); + if (ret) + return ret; + + /* + * "Tuning TX to increase the bias current used in TX driver and RX EQ, + * it can also increase the voltage of LFPS." + */ + dev_dbg(usb3phy->dev, "setting pipe for TX tuning\n"); + ret =3D rockchip_usb3phy_bulk_update(usb3phy, port->regmap, + rk3328_tx_config, ARRAY_SIZE(rk3328_tx_config)); + + /* Power up the pipe */ + dev_dbg(usb3phy->dev, "setting pipe power on\n"); + ret =3D rockchip_usb3phy_bulk_update(usb3phy, port->regmap, rk3328_pipe_= pwr_en_config, + ARRAY_SIZE(rk3328_pipe_pwr_en_config)); + } + + return 0; +} + +static int rockchip_usb3phy_parse_dt(struct rockchip_usb3phy *usb3phy, str= uct device *dev) +{ + int ret; + + usb3phy->clk_pipe =3D devm_clk_get(dev, "usb3phy-pipe"); + if (IS_ERR(usb3phy->clk_pipe)) { + dev_err(dev, "could not get usb3phy pipe clock\n"); + return PTR_ERR(usb3phy->clk_pipe); + } + + usb3phy->clk_otg =3D devm_clk_get(dev, "usb3phy-otg"); + if (IS_ERR(usb3phy->clk_otg)) { + dev_err(dev, "could not get usb3phy otg clock\n"); + return PTR_ERR(usb3phy->clk_otg); + } + + usb3phy->clk_ref =3D devm_clk_get(dev, "refclk-usb3otg"); + if (IS_ERR(usb3phy->clk_ref)) { + dev_err(dev, "could not get usb3phy ref clock\n"); + return PTR_ERR(usb3phy->clk_ref); + } + + usb3phy->u2por_rst =3D devm_reset_control_get(dev, "usb3phy-u2-por"); + if (IS_ERR(usb3phy->u2por_rst)) { + dev_err(dev, "no usb3phy-u2-por reset control found\n"); + return PTR_ERR(usb3phy->u2por_rst); + } + + usb3phy->u3por_rst =3D devm_reset_control_get(dev, "usb3phy-u3-por"); + if (IS_ERR(usb3phy->u3por_rst)) { + dev_err(dev, "no usb3phy-u3-por reset control found\n"); + return PTR_ERR(usb3phy->u3por_rst); + } + + usb3phy->pipe_rst =3D devm_reset_control_get(dev, "usb3phy-pipe-mac"); + if (IS_ERR(usb3phy->pipe_rst)) { + dev_err(dev, "no usb3phy_pipe_mac reset control found\n"); + return PTR_ERR(usb3phy->pipe_rst); + } + + usb3phy->utmi_rst =3D devm_reset_control_get(dev, "usb3phy-utmi-mac"); + if (IS_ERR(usb3phy->utmi_rst)) { + dev_err(dev, "no usb3phy-utmi-mac reset control found\n"); + return PTR_ERR(usb3phy->utmi_rst); + } + + usb3phy->pipe_apb_rst =3D devm_reset_control_get(dev, "usb3phy-pipe-apb"); + if (IS_ERR(usb3phy->pipe_apb_rst)) { + dev_err(dev, "no usb3phy-pipe-apb reset control found\n"); + return PTR_ERR(usb3phy->pipe_apb_rst); + } + + usb3phy->utmi_apb_rst =3D devm_reset_control_get(dev, "usb3phy-utmi-apb"); + if (IS_ERR(usb3phy->utmi_apb_rst)) { + dev_err(dev, "no usb3phy-utmi-apb reset control found\n"); + return PTR_ERR(usb3phy->utmi_apb_rst); + } + + usb3phy->ls_irq =3D of_irq_get_byname(dev->of_node, "linestate"); + if (usb3phy->ls_irq < 0) { + dev_err(dev, "no linestate irq provided\n"); + return usb3phy->ls_irq; + } + + ret =3D devm_request_threaded_irq(dev, usb3phy->ls_irq, NULL, rockchip_us= b3phy_linestate_irq, + IRQF_ONESHOT, "rockchip_usb3phy_ls", usb3phy); + if (ret) { + dev_err(dev, "failed to request linestate irq handle\n"); + return ret; + } + + usb3phy->bvalid_irq =3D of_irq_get_byname(dev->of_node, "bvalid"); + if (usb3phy->bvalid_irq < 0) { + dev_err(dev, "no bvalid irq provided\n"); + return usb3phy->bvalid_irq; + } + + ret =3D devm_request_threaded_irq(dev, usb3phy->bvalid_irq, NULL, rockchi= p_usb3phy_bvalid_irq, + IRQF_ONESHOT, "rockchip_usb3phy_bvalid", usb3phy); + if (ret) { + dev_err(dev, "failed to request bvalid irq handle\n"); + return ret; + } + + usb3phy->id_irq =3D of_irq_get_byname(dev->of_node, "id"); + if (usb3phy->id_irq < 0) { + dev_err(dev, "no id irq provided\n"); + return usb3phy->id_irq; + } + + ret =3D devm_request_threaded_irq(dev, usb3phy->id_irq, NULL, rockchip_us= b3phy_id_irq, + IRQF_ONESHOT, "rockchip_usb3phy-id", usb3phy); + if (ret) { + dev_err(dev, "failed to request id irq handle\n"); + return ret; + } + + usb3phy->rxdet_irq =3D of_irq_get_byname(dev->of_node, "rxdet"); + if (usb3phy->rxdet_irq < 0) { + dev_err(dev, "no rxdet irq provided\n"); + return usb3phy->rxdet_irq; + } + + ret =3D devm_request_threaded_irq(dev, usb3phy->rxdet_irq, NULL, rockchip= _usb3phy_rxdet_irq, + IRQF_ONESHOT, "rockchip_usb3phy-rxdet", usb3phy); + if (ret) { + dev_err(dev, "failed to request rxdet irq handle\n"); + return ret; + } + + return 0; +} + +static int rockchip_usb3phy_exit(struct phy *phy) +{ + struct rockchip_usb3phy_port *port =3D phy_get_drvdata(phy); + struct rockchip_usb3phy *usb3phy =3D dev_get_drvdata(phy->dev.parent); + + dev_dbg(usb3phy->dev, "usb3phy_shutdown\n"); + rockchip_usb3phy_reset(usb3phy, true, port->type); + + return 0; +} + +static const struct phy_ops rockchip_usb3phy_ops =3D { + .init =3D rockchip_usb3phy_init, + .exit =3D rockchip_usb3phy_exit, + .owner =3D THIS_MODULE, +}; + +static const struct regmap_config rockchip_usb3phy_utmi_port_regmap_config= =3D { + .reg_bits =3D 32, + .val_bits =3D 32, + .reg_stride =3D 4, + .max_register =3D 0x400, + .cache_type =3D REGCACHE_NONE, + .fast_io =3D true, + .name =3D "utmi-port", +}; + +static const struct regmap_config rockchip_usb3phy_pipe_port_regmap_config= =3D { + .reg_bits =3D 32, + .val_bits =3D 32, + .reg_stride =3D 4, + .max_register =3D 0x400, + .cache_type =3D REGCACHE_NONE, + .fast_io =3D true, + .name =3D "pipe-port", +}; + +static const struct regmap_config rockchip_usb3phy_regmap_config =3D { + .reg_bits =3D 32, + .val_bits =3D 32, + .reg_stride =3D 4, + .max_register =3D 0x400, + .write_flag_mask =3D REG_WRITE_MASK, + .cache_type =3D REGCACHE_NONE, + .fast_io =3D true, +}; + +static int rockchip_usb3phy_probe(struct platform_device *pdev) +{ + struct device *dev =3D &pdev->dev; + struct device_node *np =3D dev->of_node; + struct device_node *child_np; + struct phy_provider *provider; + struct rockchip_usb3phy *usb3phy; + const struct regmap_config regmap_config =3D rockchip_usb3phy_regmap_conf= ig; + void __iomem *base; + int i, ret; + + dev_dbg(dev, "Probe usb3phy main block\n"); + usb3phy =3D devm_kzalloc(dev, sizeof(*usb3phy), GFP_KERNEL); + if (!usb3phy) + return -ENOMEM; + + ret =3D rockchip_usb3phy_parse_dt(usb3phy, dev); + if (ret) { + dev_err(dev, "parse dt failed %i\n", ret); + return ret; + } + + base =3D devm_of_iomap(dev, np, 0, NULL); + if (IS_ERR(base)) { + dev_err(dev, "failed port ioremap\n"); + return PTR_ERR(base); + } + + usb3phy->regmap =3D devm_regmap_init_mmio(dev, base, ®map_config); + if (IS_ERR(usb3phy->regmap)) { + dev_err(dev, "regmap init failed\n"); + return PTR_ERR(usb3phy->regmap); + } + + usb3phy->dev =3D dev; + platform_set_drvdata(pdev, usb3phy); + + /* place block in reset */ + reset_control_assert(usb3phy->pipe_rst); + reset_control_assert(usb3phy->utmi_rst); + reset_control_assert(usb3phy->u3por_rst); + reset_control_assert(usb3phy->u2por_rst); + reset_control_assert(usb3phy->pipe_apb_rst); + reset_control_assert(usb3phy->utmi_apb_rst); + + fsleep(20); + + /* take apb interface out of reset */ + reset_control_deassert(usb3phy->utmi_apb_rst); + reset_control_deassert(usb3phy->pipe_apb_rst); + + /* enable usb3phy rx detection to fix disconnection issues */ + regmap_write(usb3phy->regmap, USB3PHY_WAKEUP_CON_REG, + (USB3_RXDET_EN | (USB3_RXDET_EN << REG_WRITE_SHIFT))); + + dev_dbg(dev, "Completed usb3phy core probe\n"); + + /* probe the actual ports */ + i =3D 0; + for_each_available_child_of_node(np, child_np) { + const struct regmap_config *regmap_port_config; + struct rockchip_usb3phy_port *port =3D &usb3phy->ports[i]; + struct phy *phy; + + if (of_node_name_eq(child_np, "utmi-port")) { + port->type =3D USB3PHY_TYPE_USB2; + regmap_port_config =3D &rockchip_usb3phy_utmi_port_regmap_config; + } else if (of_node_name_eq(child_np, "pipe-port")) { + port->type =3D USB3PHY_TYPE_USB3; + regmap_port_config =3D &rockchip_usb3phy_pipe_port_regmap_config; + } else { + dev_err(dev, "unknown child node port type %s\n", child_np->name); + goto err_port; + } + + base =3D devm_of_iomap(dev, child_np, 0, NULL); + if (IS_ERR(base)) { + dev_err(dev, "failed port ioremap\n"); + ret =3D PTR_ERR(base); + goto err_port; + } + + port->regmap =3D devm_regmap_init_mmio(dev, base, regmap_port_config); + if (IS_ERR(port->regmap)) { + dev_err(dev, "regmap init failed\n"); + ret =3D PTR_ERR(port->regmap); + goto err_port; + } + + phy =3D devm_phy_create(dev, child_np, &rockchip_usb3phy_ops); + if (IS_ERR(phy)) { + dev_err_probe(dev, PTR_ERR(phy), "failed to create phy\n"); + ret =3D PTR_ERR(phy); + goto err_port; + } + + port->phy =3D phy; + phy_set_drvdata(port->phy, port); + + /* to prevent out of boundary */ + if (++i >=3D USB3PHY_TYPE_MAX) { + of_node_put(child_np); + break; + } + + dev_info(dev, "Completed usb3phy %s port init\n", child_np->name); + } + + provider =3D devm_of_phy_provider_register(dev, of_phy_simple_xlate); + return PTR_ERR_OR_ZERO(provider); + +err_port: + of_node_put(child_np); + return ret; +} + +static const struct of_device_id rockchip_usb3phy_dt_ids[] =3D { + { .compatible =3D "rockchip,rk3328-usb3phy", }, +}; + +MODULE_DEVICE_TABLE(of, rockchip_usb3phy_dt_ids); + +static struct platform_driver rockchip_usb3phy_driver =3D { + .probe =3D rockchip_usb3phy_probe, + .driver =3D { + .name =3D "rockchip-usb3-phy", + .of_match_table =3D rockchip_usb3phy_dt_ids, + }, +}; + +module_platform_driver(rockchip_usb3phy_driver); + +MODULE_AUTHOR("Peter Geis "); +MODULE_DESCRIPTION("Rockchip Innosilicon USB3PHY driver"); +MODULE_LICENSE("GPL"); --=20 2.39.5 From nobody Mon Dec 15 22:06:23 2025 Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) (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 D1A1C84D29; Wed, 15 Jan 2025 01:26:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736904411; cv=none; b=L82s22WnUxf++JY2pGtZO6jVY6XRvfRtMQUpqNFM3f3pJZQWaERDEWO18zRx25N6t1B5jQshxe6IgHSsFDczqia2r7su5loGgID0vq8OhJEO/bx7unbepiWKfiVn/7AMag4g3DZHskKSs7eoSF/GtbC0hz86EPRu9EsXZEH7bpc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736904411; c=relaxed/simple; bh=UprjdVHx1LkxBMjXINeLhJqTQcjHtxQd0WJx6sHcEHY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mELczLdgUxyQdYCIR0LOJsC2/GVhTp+nDDwq7d6hFO1hWIKL1MWKVSF3VQgID0rhyGQl6kGX9TofELFczg7hKv03o1Cn60yW74g64nG9YLKDTP6T7psZw2g5qxH4S67KyjkhOdnqxxI6yt4O8nkk/FLpuOuzy01TUE7XMZHMjx0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hxntcDLz; arc=none smtp.client-ip=209.85.160.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hxntcDLz" Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-467a3c85e11so41339141cf.2; Tue, 14 Jan 2025 17:26:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736904409; x=1737509209; darn=vger.kernel.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=yyuiOWHUod2sqfzhej2zdZRrKrw1CUBKcQwVtOUV0E8=; b=hxntcDLzNELHiB6VrR9JMomvlhryoJqMkT6iTjiGmuXx1nM0eliZPdz5j+IYou7zkR 1WF3A/QUX1IQTgAYfyBZ/r9+Xm8HuZzZc1I03auzJqX2nRrjKTlB1Ldrax2gSiGRQZjD NlMzEjet0vB9olT/qbyaxrCa+MGyR6jO38lX4oUepUN/rgJiXBjqovQbQfRH6qQR68di aOhIdV3Ysxmdg02xbIrMWkEY/vj1ydY6SUjN0wz6ZfMm0jVvzBpV0LTyrwzbRQtsjYGa TMGpDduCjA5DUT3rGQh6hRb7ANDU4VzWPev0mhRsQP315sBXChQXPIIV/1FrYxbr6L7d 8aaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736904409; x=1737509209; 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=yyuiOWHUod2sqfzhej2zdZRrKrw1CUBKcQwVtOUV0E8=; b=OGJk8S5gXXPcwjNlX9WlGaw6S0j+hfqlSLDzONFCjyuDVm0gYmsBt8iu9TmHWjC/Ej VwApQLQ+Y7LycqoUrXZ4UjLXwgrBCjMqVtsxNSZfpq/6Lvx1mIytIj7JyIde4z2TMEwt nw4ye6wdwGpBmXPgbzMtjcwLHHiax6FmHfD/V6gzrlpdmcW5S35k84XcP8NiMGk3ax90 6jYjJ0sI3EwhBrThaciI4jNWgIJ1fLQ0vZFQoaOat/6dZI7ULaGvMUBIvhYUza4BiEMK k69L9GmBLgyUWEJsly0nFT4Vl/pQvHEV00ytzXnGOW2P2Qbd8wwCl8Cj6Ltf8c7vPlRP ZCbw== X-Forwarded-Encrypted: i=1; AJvYcCWvi4YZkfV2X2wpC8EJsk5s+nqG7CCO9InTzrOl30Vb0NEewlYNZVNcqJTScdxrKtuP+agpm47RCZ8ZSrjr@vger.kernel.org, AJvYcCXDmcprdgG+r8kUzNc+w5ykoRv2TnePR47cXhVV5DYgQvlld30NMJL3ZtDdMO3rcwoh3oVpaR2Beif+@vger.kernel.org X-Gm-Message-State: AOJu0YzybCE5tzS3ZhvrIBaZn37z6QqgjyKgPrEoWkSE4ug0N2jIPDP3 wMEyT1YpEWdyZgH9K6lat50tAVHQ0gyaTvKnG02Kktooc8qrX20K X-Gm-Gg: ASbGncuTWQIF56QZW2qcneO4wLkNzWvCNNUFjF2atvqYdhewcJsAIMxp4jmPS3VB+vt 3ByvMJ+dARC1ItwUwaX/lJGCPKYQzbhT+VX7ee7DyZxrjh9BydHygAF6FAkpaYzhZYfYFKWHCEY pQ6YnL/kMHs3w4KDDHhuSpUNmvC1sQNkl1F/QnuoV/GEiIEkp9UmYI3ijAKTHjXHhJ50oDqtATM IAHajTvD8SXkMykhHJav3H0W7U13nIQBfpVXEl9Eexoun/zlCno1CNQOktyJdx8yOBs X-Google-Smtp-Source: AGHT+IGVwN2rLclQGuxl2u8LG0fj7kqMeY5ZEai4kqHocjNfKR80vQhAtoz97g9hIjYX7GdkJYOSuQ== X-Received: by 2002:ac8:5916:0:b0:467:706f:14b7 with SMTP id d75a77b69052e-46c710a98ebmr466909541cf.30.1736904408728; Tue, 14 Jan 2025 17:26:48 -0800 (PST) Received: from master-x64.sparksnet ([204.111.227.95]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46c8733130dsm59933881cf.25.2025.01.14.17.26.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 17:26:47 -0800 (PST) From: Peter Geis To: Heiko Stuebner Cc: zyw@rock-chips.com, kever.yang@rock-chips.com, frank.wang@rock-chips.com, william.wu@rock-chips.com, wulf@rock-chips.com, linux-rockchip@lists.infradead.org, Peter Geis , Alex Bee , Conor Dooley , Diederik de Haas , Dragan Simic , Johan Jonker , Jonas Karlman , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v1 4/6] arm64: dts: rockchip: add rk3328 usb3 phy node Date: Wed, 15 Jan 2025 01:26:25 +0000 Message-Id: <20250115012628.1035928-5-pgwipeout@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250115012628.1035928-1-pgwipeout@gmail.com> References: <20250115012628.1035928-1-pgwipeout@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add the node for the rk3328 usb3 phy. This node provides a combined usb2 and usb3 phy which are permenantly tied to the dwc3 usb3 controller. Signed-off-by: Peter Geis --- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts= /rockchip/rk3328.dtsi index 7d992c3c01ce..181a900d41f9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -903,6 +903,43 @@ u2phy_host: host-port { }; }; =20 + usb3phy: usb3-phy@ff460000 { + compatible =3D "rockchip,rk3328-usb3phy"; + reg =3D <0x0 0xff460000 0x0 0x10000>; + clocks =3D <&cru SCLK_REF_USB3OTG>, <&cru PCLK_USB3PHY_OTG>, <&cru PCLK_= USB3PHY_PIPE>; + clock-names =3D "refclk-usb3otg", "usb3phy-otg", "usb3phy-pipe"; + interrupts =3D , , + , ; + interrupt-names =3D "bvalid", "id", "linestate", "rxdet"; + resets =3D <&cru SRST_USB3PHY_U2>, + <&cru SRST_USB3PHY_U3>, + <&cru SRST_USB3PHY_PIPE>, + <&cru SRST_USB3OTG_UTMI>, + <&cru SRST_USB3PHY_OTG_P>, + <&cru SRST_USB3PHY_PIPE_P>; + reset-names =3D "usb3phy-u2-por", "usb3phy-u3-por", + "usb3phy-pipe-mac", "usb3phy-utmi-mac", + "usb3phy-utmi-apb", "usb3phy-pipe-apb"; + #address-cells =3D <2>; + #size-cells =3D <2>; + ranges; + status =3D "disabled"; + + usb3phy_utmi: utmi-port@ff470000 { + compatible =3D "rockchip,rk3328-usb3phy-utmi"; + reg =3D <0x0 0xff470000 0x0 0x8000>; + #phy-cells =3D <0>; + status =3D "disabled"; + }; + + usb3phy_pipe: pipe-port@ff478000 { + compatible =3D "rockchip,rk3328-usb3phy-pipe"; + reg =3D <0x0 0xff478000 0x0 0x8000>; + #phy-cells =3D <0>; + status =3D "disabled"; + }; + }; + sdmmc: mmc@ff500000 { compatible =3D "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc"; reg =3D <0x0 0xff500000 0x0 0x4000>; @@ -1067,6 +1104,8 @@ usbdrd3: usb@ff600000 { clock-names =3D "ref_clk", "suspend_clk", "bus_clk"; dr_mode =3D "otg"; + phys =3D <&usb3phy_utmi>, <&usb3phy_pipe>; + phy-names =3D "usb2-phy", "usb3-phy"; phy_type =3D "utmi_wide"; snps,dis-del-phy-power-chg-quirk; snps,dis_enblslpm_quirk; --=20 2.39.5 From nobody Mon Dec 15 22:06:23 2025 Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) (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 60AE68633F; Wed, 15 Jan 2025 01:26:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736904414; cv=none; b=uCcdA25BTmGlV5iVVq8aNAfMdEizirZ/4wKGLCZplJLY/+X+lHntTZCjviD9CELdOxkTNFs9ZF+LpBR5lfPO3VY39yRm9laDiAuU5Sj9Da3QPgD66rMbhsQ254toJTvHiRiQlk9j4PxiBQgSNGOGVoz1uqHyEWIAY20i2cOC4V0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736904414; c=relaxed/simple; bh=7QyXOos554TA5g0npv3XCcyipqB+km9lM8OtSYg8IHg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gJ8GNfhrdhiZ/k0Cj000dl6QxB4I7l7Zh3BqDnJxlyBy5ADZlMHG69y8Kw/hwZZap+0+uYIAiTDHVxx1eqrN1VD5GSXrFklwjLHZE+iwSh9XEas1HirOs71Pw+ypRk2NHjCILB13OQxF1wYV/R7XqiWbSHOg/2Pl61wjgWom5Vs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HM37caCm; arc=none smtp.client-ip=209.85.160.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HM37caCm" Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-4679ea3b13bso51805511cf.1; Tue, 14 Jan 2025 17:26:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736904411; x=1737509211; darn=vger.kernel.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=gVssDOqm+J+pahSUoCWyMm9PmHHWDBPd01GSGUshCEI=; b=HM37caCmMIsTeYmKdJ32foIlDJYZ9uxnzFgW/GtOWwLE1irGRdDP49s/Co0WO1dhft OHcxhHui25Y6ld8b54YPkxAcYCpugf6GwYDaUqPMokLTOzZs25OIlOY0gCkWmtCM93yy Fb16bmgMgzb0LbzVsY440EzraXpgRVy6v17FPMxEJxDDWYG6iRmlAAyFheDhZWERRWhw jNJMj3SfkJw4DH9WHTPcA3jfISQC0w6Ai1X62gsnR7Rk3ez3I8pbS9YHa0nKnQ1EoMN7 PB6uUmSQW5A25/qFBVZPBIdSsHEEevQWDutCLz3w9s5tTrQAH7Iq3hMQ/HOhQDWu2nfU olNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736904411; x=1737509211; 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=gVssDOqm+J+pahSUoCWyMm9PmHHWDBPd01GSGUshCEI=; b=xRVCLfl5wrF5zL+ZcCPR9H9N5t8inSYP2rQSfvIkwTTI0IiPB97CiAgy0a/eg2o3vS gXMyaOC+m5EpAqCZt63DjDvsKGU7tQ4j3xRYWtCD8hJ4taF4oLCCxA5Wb4lszOX3snb5 grgo5/1QWG6KECVpmpBdjwBAisbSTnYZaLY3bMBm5eQS4DFNHYIjy63Sq1rqSuIqatTL lvnf13iJHH6IwoXug2WN421VG+0LBziV35yf+aO1tqCMWVbzMYtD9VxVUcOEUL63eExX Vcum7snzC2pdEDEl5npm2PKxBa/iFxDh1j5IYKaF3LrqRISHJ1fi5UvrGKyAxlqS+qG+ nzpg== X-Forwarded-Encrypted: i=1; AJvYcCWcbiva04i0sAIulQNW37c7Lgi9LM017jMchSybdTZ19ql9aPKcu1dVn2oZVWIBlrJPlAwyR4RYsB+k@vger.kernel.org, AJvYcCXWfACZan5Odm84OLMuBKmcsHVLYpOUDJvRs41U4WfiOl6m3fhzWHd7Y0jDiysJqNs6nNLC+P/97dfGbQ6N@vger.kernel.org X-Gm-Message-State: AOJu0YwP9AUHgekhglX74Y4JkqiGE19im2nU9EWhGUSQazG7xxUg5nkz iiqqQbn/wmIy+miaRnbEd6jhjfLJUqPHTg9wEatvnqp3XFaOgRZb X-Gm-Gg: ASbGnct9TzYAHstA6XBWGZ3dJ8mW2hXXwgVxhz7FptKExWDNYzMA0qSWSxt1hIVaqaM uiRxsh9pL6fcgnoB3Q0p+//P7ZQjL4FfBfYLb2aZmU12ZonE4oahqntkSBUkl03gmTesjt3Zhdo 7i9DBcHLFETqQxGTuYRIa3xXdMhzD6x3Cwmxd3i9dwBkgYKB1HiecUUjgU9kj9+ZUGAaBbVGYi/ A/IR0tqK8uiFktBNx7Om7KWtiPiX8osLXqPF0IKrUUszTAEk9vAtTSttX/f4PdQ2nMo X-Google-Smtp-Source: AGHT+IFrgnJpvh7aaVGnucMvaHv2rELTJ/5OFWUkqkYUWq+MAPY2UvyFQanWVih4LLhOlXh3fh8rug== X-Received: by 2002:a05:622a:1a94:b0:467:4380:76f6 with SMTP id d75a77b69052e-46c70fd31efmr447700921cf.11.1736904411316; Tue, 14 Jan 2025 17:26:51 -0800 (PST) Received: from master-x64.sparksnet ([204.111.227.95]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46c8733130dsm59933881cf.25.2025.01.14.17.26.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 17:26:50 -0800 (PST) From: Peter Geis To: Heiko Stuebner Cc: zyw@rock-chips.com, kever.yang@rock-chips.com, frank.wang@rock-chips.com, william.wu@rock-chips.com, wulf@rock-chips.com, linux-rockchip@lists.infradead.org, Peter Geis , Conor Dooley , Diederik de Haas , Dragan Simic , Johan Jonker , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v1 5/6] arm64: dts: rockchip: enable the usb3 phy on rk3328-roc boards Date: Wed, 15 Jan 2025 01:26:26 +0000 Message-Id: <20250115012628.1035928-6-pgwipeout@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250115012628.1035928-1-pgwipeout@gmail.com> References: <20250115012628.1035928-1-pgwipeout@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Enable the new usb3 phy nodes on the rk3328-roc boards. Signed-off-by: Peter Geis --- arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi b/arch/arm64/boot= /dts/rockchip/rk3328-roc.dtsi index b5bd5e7d5748..22d93c1901ed 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi @@ -360,6 +360,18 @@ &usbdrd3 { status =3D "okay"; }; =20 +&usb3phy { + status =3D "okay"; +}; + +&usb3phy_utmi { + status =3D "okay"; +}; + +&usb3phy_pipe { + status =3D "okay"; +}; + &usb_host0_ehci { status =3D "okay"; }; --=20 2.39.5 From nobody Mon Dec 15 22:06:23 2025 Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.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 1E40A481AF; Wed, 15 Jan 2025 01:26:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736904416; cv=none; b=KUjkZygblyBvG4W3qWjZL1iAjC2vvjh3Oes1mUYOOsVGVzW5xTCHCqFXVU9mQhzJ0txq/kAFO1NCVs8Cn4psJEUC5f4PK0lSzDdxhtRNWZDfe39cOuIsuNOLK5SQ3UMYevoTBZXHqd/PSn68fY8YMUOijquwcRzj9S2hZGVRRyo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736904416; c=relaxed/simple; bh=QmDtyYguQ0fizyxSmJo482RF36/4VTJ4Qs7t/dBEjCU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=R+y8Oyljy18P5TcL1Wg8DxKReNpMuXZSP1LZ0DPM9tUxSjlFEpPBLlshDIPlZBWtDbT3BXX1Ca/7UeqjIXo2I9dzXWno3KSLvLv6IzEGXUuU4NdM9itel3BXWGR07ktPRo9qnEF9JwF/EUK8pKpJBFxCb+2sIzeg/bWoAGNSfzE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bLdJ7ZJ+; arc=none smtp.client-ip=209.85.160.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bLdJ7ZJ+" Received: by mail-qt1-f179.google.com with SMTP id d75a77b69052e-46b1d40ac6bso3507751cf.0; Tue, 14 Jan 2025 17:26:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736904414; x=1737509214; darn=vger.kernel.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=hFMwJAaeoRNdQ7wFB7oOxwf1IaEkyF3Nv5JGSL6B9MU=; b=bLdJ7ZJ+6DO/4c5+hIdYzRas/VY1PkkROV/5T4yzFR9hi29R25HF8yY7j4eW5w1Paf tyGNslg29esIlMfX65DK9wvWldgi+aAGlTZpcCmTuM36a7bfOqAQjFP1ZDcVwxEUqdPJ VMyeunLwmUTsHkWkcATfzJ/crkDPkaY5Z4S8E5IVFg74gtWnWzbXTs0SjrcJf+/6hQ0+ w84qdkNd5THFOie4aPgVHHgEMY1ewX/QRJQ2yG3MY+4ZrJhwWuB9Eeew+A63fNdzVSEw gJ89z9i+vV8Ug+r8IfqQSCmXHjQbkuNcwEDAEEwmdbVbUcPLYKX+gJj1Bb4dxJ4xZKOX BjpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736904414; x=1737509214; 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=hFMwJAaeoRNdQ7wFB7oOxwf1IaEkyF3Nv5JGSL6B9MU=; b=JQKqzIcOdWEuulfJDnST5cDWfd+JUDjHFrjMUb3p5K9qvDQ4KQspyqWpzE3AKvdZuV i6Lq+XpNgnVfmiocjMFtBq33UZ/HHp1fdZM+zRuI0mhLOCTkeNG4CansvuwHxS+W0Bu8 QdHN/UWONfPjvGssmHLOnHpUa3MCBzQj9VE1r3lsLpSr/RoYqf4tKN8p8d8Hu/Mxd0Xm hkguXIW5fKHRIPEWLGYaO6Cg9VAxcce5iF/4NfQG9tBvjSiO293qx6IpzF1QttARxcF0 2zwb8WLGG0yNlqrOnhlkhtOuupAP53zD6+AVJcvXQpdbTDIBWSqWWFIbxIVM+Vbpiz0o w0Pg== X-Forwarded-Encrypted: i=1; AJvYcCU5RQ+5Lm9rH2MF2lIST0q3JKdew9izwyDSj7PzZMr0MR8uhLiKX6ckSCFU+0Kv5OCgNiQ+PCSObTHRx/js@vger.kernel.org, AJvYcCVDDvohjY9HQdXyiijrpIq4lbFghtgtBwToh+/CaW6SS0C0SP5be7Osyl5c2iYem2b+JQlPqk7DQ3QS@vger.kernel.org X-Gm-Message-State: AOJu0YyEDMcT3O+4W+t1zE9UQrggQ1QaCh5issELbAa6PRHmTgGzRimh FbRpeBmMHiZWZ8o6N2Z24gI9AFPBJrMZUYCCdR40+oY8gePiFWFF X-Gm-Gg: ASbGncsGWtlVbHqTgrSnlBiZb/Kkv0CEWbIddoGpQu5M+nC1mhLRzEoEK2s8PRJ6vp2 E8TZ78HPWPnP0twt6S+96Ba5X0KL9bKcO0M6Q1a/5BNHnw6EkVyaPC4njpvZuGcwrAPbdO2QrMT AMILkL+SGZdak/zcnYeevIo+OQnHiBIm0MbFvDJQf2/PTw7nR6EQrmBsyzJYxcmjZ6oSsqGbrm1 UmTy6vgfHX2kG833TFs65XsvHKbF579o1hRva54SRrSDtqb/2SbWlyEMl0mHW1IdtWK X-Google-Smtp-Source: AGHT+IFbToSOgBgyFlAAQb6WU2ckT5CIGlBK7iJrhnVXB8ROQS2yvhyIzkDE/m/9jLZTkhccFjgHlg== X-Received: by 2002:a05:622a:344:b0:467:6654:3dda with SMTP id d75a77b69052e-46df56ad2d9mr20388131cf.12.1736904413930; Tue, 14 Jan 2025 17:26:53 -0800 (PST) Received: from master-x64.sparksnet ([204.111.227.95]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46c8733130dsm59933881cf.25.2025.01.14.17.26.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 17:26:52 -0800 (PST) From: Peter Geis To: Heiko Stuebner Cc: zyw@rock-chips.com, kever.yang@rock-chips.com, frank.wang@rock-chips.com, william.wu@rock-chips.com, wulf@rock-chips.com, linux-rockchip@lists.infradead.org, Peter Geis , Conor Dooley , Diederik de Haas , Dragan Simic , FUKAUMI Naoki , Johan Jonker , Krzysztof Kozlowski , Rob Herring , Trevor Woerner , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v1 6/6] arm64: dts: rockchip: enable the usb3 phy on remaining rk3328 boards Date: Wed, 15 Jan 2025 01:26:27 +0000 Message-Id: <20250115012628.1035928-7-pgwipeout@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250115012628.1035928-1-pgwipeout@gmail.com> References: <20250115012628.1035928-1-pgwipeout@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Enable the new usb3 phy nodes on the remaining rk3328 boards. This is done separately from the rk3328-roc boards due to lack of testing, in case of regressions. Signed-off-by: Peter Geis --- arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2.dtsi | 12 ++++++++++++ .../boot/dts/rockchip/rk3328-orangepi-r1-plus.dtsi | 12 ++++++++++++ arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 12 ++++++++++++ arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 12 ++++++++++++ 4 files changed, 48 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2.dtsi b/arch/arm6= 4/boot/dts/rockchip/rk3328-nanopi-r2.dtsi index 1715d311e1f2..a4d880725a96 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2.dtsi @@ -385,6 +385,18 @@ rtl8153: device@2 { }; }; =20 +&usb3phy { + status =3D "okay"; +}; + +&usb3phy_utmi { + status =3D "okay"; +}; + +&usb3phy_pipe { + status =3D "okay"; +}; + &usb_host0_ehci { status =3D "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dtsi b/ar= ch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dtsi index 82021ffb0a49..f70d28e6da5d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dtsi @@ -349,6 +349,18 @@ rtl8153: device@2 { }; }; =20 +&usb3phy { + status =3D "okay"; +}; + +&usb3phy_utmi { + status =3D "okay"; +}; + +&usb3phy_pipe { + status =3D "okay"; +}; + &usb_host0_ehci { status =3D "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64= /boot/dts/rockchip/rk3328-rock-pi-e.dts index 425de197ddb8..4ce6b16cf291 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts @@ -440,6 +440,18 @@ &usbdrd3 { status =3D "okay"; }; =20 +&usb3phy { + status =3D "okay"; +}; + +&usb3phy_utmi { + status =3D "okay"; +}; + +&usb3phy_pipe { + status =3D "okay"; +}; + &usb_host0_ehci { status =3D "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/bo= ot/dts/rockchip/rk3328-rock64.dts index 745d3e996418..2e366de96390 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts @@ -379,6 +379,18 @@ &usbdrd3 { status =3D "okay"; }; =20 +&usb3phy { + status =3D "okay"; +}; + +&usb3phy_utmi { + status =3D "okay"; +}; + +&usb3phy_pipe { + status =3D "okay"; +}; + &usb_host0_ehci { status =3D "okay"; }; --=20 2.39.5