From patchwork Mon Jul 12 23:46:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andres Salomon X-Patchwork-Id: 473392 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEABBC07E9A for ; Mon, 12 Jul 2021 23:54:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8710761073 for ; Mon, 12 Jul 2021 23:54:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233025AbhGLX5h (ORCPT ); Mon, 12 Jul 2021 19:57:37 -0400 Received: from spindle.queued.net ([45.33.49.30]:54854 "EHLO spindle.queued.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233294AbhGLX5h (ORCPT ); Mon, 12 Jul 2021 19:57:37 -0400 Received: from e7470.queued.net (cpe-104-162-173-121.nyc.res.rr.com [104.162.173.121]) by spindle.queued.net (Postfix) with ESMTPSA id A1BE7101DBF; Mon, 12 Jul 2021 16:46:20 -0700 (PDT) Date: Mon, 12 Jul 2021 19:46:18 -0400 From: Andres Salomon To: stable@vger.kernel.org Cc: Cameron Nemo , dilinger@queued.net Subject: [PATCH stable 5.10 1/2] arm64: dts: rockchip: add rk3328 dwc3 usb controller node Message-ID: <20210712194618.3f3e5098@e7470.queued.net> In-Reply-To: <20210712194251.7af563ed@e7470.queued.net> References: <20210712194251.7af563ed@e7470.queued.net> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Cameron Nemo commit 44dd5e2106dc2fd01697b539085818d1d1c58df0 upstream RK3328 SoCs have one USB 3.0 OTG controller which uses DWC_USB3 core's general architecture. It can act as static xHCI host controller, static device controller, USB 3.0/2.0 OTG basing on ID of USB3.0 PHY. Signed-off-by: William Wu Signed-off-by: Cameron Nemo Signed-off-by: Johan Jonker Signed-off-by: Heiko Stuebner Link: https://lore.kernel.org/r/20210209192350.7130-7-jbx6244@gmail.com Signed-off-by: Heiko Stuebner --- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi index 93c734d8a46c..de1e5e8a0e88 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -984,6 +984,25 @@ usb_host0_ohci: usb@ff5d0000 { status = "disabled"; }; + usbdrd3: usb@ff600000 { + compatible = "rockchip,rk3328-dwc3", "snps,dwc3"; + reg = <0x0 0xff600000 0x0 0x100000>; + interrupts = ; + clocks = <&cru SCLK_USB3OTG_REF>, <&cru SCLK_USB3OTG_SUSPEND>, + <&cru ACLK_USB3OTG>; + clock-names = "ref_clk", "suspend_clk", + "bus_clk"; + dr_mode = "otg"; + phy_type = "utmi_wide"; + snps,dis-del-phy-power-chg-quirk; + snps,dis_enblslpm_quirk; + snps,dis-tx-ipgap-linecheck-quirk; + snps,dis-u2-freeclk-exists-quirk; + snps,dis_u2_susphy_quirk; + snps,dis_u3_susphy_quirk; + status = "disabled"; + }; + gic: interrupt-controller@ff811000 { compatible = "arm,gic-400"; #interrupt-cells = <3>; From patchwork Mon Jul 12 23:48:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andres Salomon X-Patchwork-Id: 473393 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 978BEC07E9A for ; Mon, 12 Jul 2021 23:48:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7BA3B6115A for ; Mon, 12 Jul 2021 23:48:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230043AbhGLXvB (ORCPT ); Mon, 12 Jul 2021 19:51:01 -0400 Received: from spindle.queued.net ([45.33.49.30]:54844 "EHLO spindle.queued.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233469AbhGLXvB (ORCPT ); Mon, 12 Jul 2021 19:51:01 -0400 X-Greylist: delayed 316 seconds by postgrey-1.27 at vger.kernel.org; Mon, 12 Jul 2021 19:51:01 EDT Received: from e7470.queued.net (cpe-104-162-173-121.nyc.res.rr.com [104.162.173.121]) by spindle.queued.net (Postfix) with ESMTPSA id E53CD101E5F; Mon, 12 Jul 2021 16:48:11 -0700 (PDT) Date: Mon, 12 Jul 2021 19:48:10 -0400 From: Andres Salomon To: stable@vger.kernel.org Cc: Cameron Nemo , dilinger@queued.net Subject: [PATCH stable 5.10 2/2] arm64: dts: rockchip: Enable USB3 for rk3328 Rock64 Message-ID: <20210712194810.074c7c09@e7470.queued.net> In-Reply-To: <20210712194251.7af563ed@e7470.queued.net> References: <20210712194251.7af563ed@e7470.queued.net> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Cameron Nemo commit bbac8bd65f5402281cb7b0452c1c5f367387b459 upstream Enable USB3 nodes for the rk3328-based PINE Rock64 board. The separate power regulator is not added as it is controlled by the same GPIO line as the existing VBUS regulators, so it is already enabled. Also there is no port representation to tie the regulator to. [wens@csie.org: Rebased onto v5.12] Signed-off-by: Cameron Nemo [wens@csie.org: Rewrote commit message] Signed-off-by: Chen-Yu Tsai Link: https://lore.kernel.org/r/20210504083616.9654-2-wens@kernel.org Signed-off-by: Heiko Stuebner --- arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts index 86cfb5c50a94..95ab6928cfd4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts @@ -384,6 +384,11 @@ &usb20_otg { status = "okay"; }; +&usbdrd3 { + dr_mode = "host"; + status = "okay"; +}; + &usb_host0_ehci { status = "okay"; };