From patchwork Tue Feb 9 19:23:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12078913 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 8D94DC433DB for ; Tue, 9 Feb 2021 19:24:12 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0EAF564EB4 for ; Tue, 9 Feb 2021 19:24:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0EAF564EB4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=FlDw9tRrcDPVBRIlfnmxXVv8TvYfLZi2whoBQWToaKA=; b=dlTffWMkNxG5ZLqRwVLiyBqaaV 7fZWrGAA4jhlszevd993p72kIDxunPtNrLjZavTVUpXfO4ZsG8r0jiNz/7suwvkzP4WqF6e1lhISg cgMeI3DFqh611FJQXjbU2rmh0/61BKrOTMx7YqgyFV0QVDoIaWLgFcciLgbYXFB2JWR/OatYfOfgO V0r8ASNSzzbw6Farc+32Du7zgc4grF2IDz+YsFco2B1HSyHIPsjr3LsjmLy1X189HpWX3oUOrM4pz Q63rAPwVA5P69kWqL/Muuk76sTXm5dH/6cNKJMQ9U9MpCIwSN5ylDAXOs5CptfqRtj0mhQo9FOgN3 QGJYSy6g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9YcG-0004t3-SB; Tue, 09 Feb 2021 19:24:04 +0000 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9YcE-0004rO-BD; Tue, 09 Feb 2021 19:24:03 +0000 Received: by mail-ed1-x534.google.com with SMTP id s11so25379057edd.5; Tue, 09 Feb 2021 11:24:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=4V4/+26zsQZ2u3jORNUZoR6RaMNMYHKRgtZ7++gnTVQ=; b=RlOyEWxUPx0hNNFrJ0DkMvgTbdW7WTaT3poNpKaI9Y2zrsbpPA1suK7o1EYyi+D3gP efpqeMF12k6rLTGoNZcCijq/qJx6dX2c+XI5KjlFAQT7ynvz1vzw1hw0tr6tXCBnmMZ0 G2W+0zXQoYhg/sFualou4xb0fRIHP7zSCRqSgIcP4dIAU9IZxAxgasYmAOjuD9eD2+c+ 6nd2janVOktg+K5+tkjJ5czP8tnrK5e3v07bLzzfQs/uMbl+v4tSWt9E2xrE3eaRVTVf dF1PmYNSdl+3Ak9X+Vc4plaGBw61haTZmSHcQEyMbxqDXUcXaLyZbt33SQBX5Gpz4TyN 4NoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4V4/+26zsQZ2u3jORNUZoR6RaMNMYHKRgtZ7++gnTVQ=; b=KuL7Iy8FXwTaioE2/zJSH8tO8pNqOZbCA7XRJEZRu4sQpEI7lrhhxF4AZ8y6zQjrHX G75bP1B+1H3/cvPjn+eHe6QZdA0ZnM3yhjzO/pKkJcxOQseM0xf6JteRTpnoUiHAVeSo pKmsrf0scOsgk3Jm4irM1E2gfC8Tbn9gyNmHF50gOkHNA2sTc1y9ZlmhZ4RR4AXDPNGB myYiuGCt7IV16YopkVlh872HJHQQSjDn0ZlBrPYCdYxrPxtNZg0RFzsOWrgQv0u0kCl6 yHE9cFpAu7NjR0GDTIIOh6KPOPwV4/wU0Oz03/XXi1s1yrRSFR/naeAXjCvuuM31KGDN 0nLg== X-Gm-Message-State: AOAM5322dOB1CNgzEHZ77cEAFA1kvqGtSPF8vK/9XSEOUwprd1Oaa/yg W672l6zXkyTnpFI4PfyOdyVket2KAEk= X-Google-Smtp-Source: ABdhPJzQ95LGdKuV+f/YUrN0ggL7Ct6sBaX/OzVyRU1WmwijkdKR22tvrlllf21hzI/g7xEMabdXKQ== X-Received: by 2002:a05:6402:281:: with SMTP id l1mr5021169edv.252.1612898639175; Tue, 09 Feb 2021 11:23:59 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id w3sm11075779eja.52.2021.02.09.11.23.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2021 11:23:58 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v5 1/8] dt-bindings: usb: convert rockchip,dwc3.txt to yaml Date: Tue, 9 Feb 2021 20:23:43 +0100 Message-Id: <20210209192350.7130-1-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210209_142402_419758_0D62CCA1 X-CRM114-Status: GOOD ( 17.38 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org In the past Rockchip dwc3 usb nodes were manually checked. With the conversion of snps,dwc3.yaml as common document we now can convert rockchip,dwc3.txt to yaml as well. Remove node wrapper. Added properties for rk3399 are: power-domains resets reset-names Signed-off-by: Johan Jonker Reviewed-by: Rob Herring --- Changed V5: add select Changed V3: remove aclk_usb3_rksoc_axi_perf remove aclk_usb3 Changed V2: remove node wrapper --- .../devicetree/bindings/usb/rockchip,dwc3.txt | 56 ----------- .../devicetree/bindings/usb/rockchip,dwc3.yaml | 104 +++++++++++++++++++++ 2 files changed, 104 insertions(+), 56 deletions(-) delete mode 100644 Documentation/devicetree/bindings/usb/rockchip,dwc3.txt create mode 100644 Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml diff --git a/Documentation/devicetree/bindings/usb/rockchip,dwc3.txt b/Documentation/devicetree/bindings/usb/rockchip,dwc3.txt deleted file mode 100644 index 945204932..000000000 --- a/Documentation/devicetree/bindings/usb/rockchip,dwc3.txt +++ /dev/null @@ -1,56 +0,0 @@ -Rockchip SuperSpeed DWC3 USB SoC controller - -Required properties: -- compatible: should contain "rockchip,rk3399-dwc3" for rk3399 SoC -- clocks: A list of phandle + clock-specifier pairs for the - clocks listed in clock-names -- clock-names: Should contain the following: - "ref_clk" Controller reference clk, have to be 24 MHz - "suspend_clk" Controller suspend clk, have to be 24 MHz or 32 KHz - "bus_clk" Master/Core clock, have to be >= 62.5 MHz for SS - operation and >= 30MHz for HS operation - "grf_clk" Controller grf clk - -Required child node: -A child node must exist to represent the core DWC3 IP block. The name of -the node is not important. The content of the node is defined in dwc3.txt. - -Phy documentation is provided in the following places: -Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml - USB2.0 PHY -Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt - Type-C PHY - -Example device nodes: - - usbdrd3_0: usb@fe800000 { - compatible = "rockchip,rk3399-dwc3"; - clocks = <&cru SCLK_USB3OTG0_REF>, <&cru SCLK_USB3OTG0_SUSPEND>, - <&cru ACLK_USB3OTG0>, <&cru ACLK_USB3_GRF>; - clock-names = "ref_clk", "suspend_clk", - "bus_clk", "grf_clk"; - #address-cells = <2>; - #size-cells = <2>; - ranges; - usbdrd_dwc3_0: dwc3@fe800000 { - compatible = "snps,dwc3"; - reg = <0x0 0xfe800000 0x0 0x100000>; - interrupts = ; - dr_mode = "otg"; - }; - }; - - usbdrd3_1: usb@fe900000 { - compatible = "rockchip,rk3399-dwc3"; - clocks = <&cru SCLK_USB3OTG1_REF>, <&cru SCLK_USB3OTG1_SUSPEND>, - <&cru ACLK_USB3OTG1>, <&cru ACLK_USB3_GRF>; - clock-names = "ref_clk", "suspend_clk", - "bus_clk", "grf_clk"; - #address-cells = <2>; - #size-cells = <2>; - ranges; - usbdrd_dwc3_1: dwc3@fe900000 { - compatible = "snps,dwc3"; - reg = <0x0 0xfe900000 0x0 0x100000>; - interrupts = ; - dr_mode = "otg"; - }; - }; diff --git a/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml b/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml new file mode 100644 index 000000000..9908270a9 --- /dev/null +++ b/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml @@ -0,0 +1,104 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/usb/rockchip,dwc3.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip SuperSpeed DWC3 USB SoC controller + +maintainers: + - Heiko Stuebner + +description: + The common content of the node is defined in snps,dwc3.yaml. + + Phy documentation is provided in the following places. + + USB2.0 PHY + Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml + + Type-C PHY + Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt + +allOf: + - $ref: snps,dwc3.yaml# + +select: + properties: + compatible: + contains: + enum: + - rockchip,rk3399-dwc3 + required: + - compatible + +properties: + compatible: + items: + - enum: + - rockchip,rk3399-dwc3 + - const: snps,dwc3 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: + Controller reference clock, must to be 24 MHz + - description: + Controller suspend clock, must to be 24 MHz or 32 KHz + - description: + Master/Core clock, must to be >= 62.5 MHz for SS + operation and >= 30MHz for HS operation + - description: + Controller grf clock + + clock-names: + items: + - const: ref_clk + - const: suspend_clk + - const: bus_clk + - const: grf_clk + + power-domains: + maxItems: 1 + + resets: + maxItems: 1 + + reset-names: + const: usb3-otg + +unevaluatedProperties: false + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + +examples: + - | + #include + #include + + bus { + #address-cells = <2>; + #size-cells = <2>; + + usbdrd3_0: usb@fe800000 { + compatible = "rockchip,rk3399-dwc3", "snps,dwc3"; + reg = <0x0 0xfe800000 0x0 0x100000>; + interrupts = ; + clocks = <&cru SCLK_USB3OTG0_REF>, <&cru SCLK_USB3OTG0_SUSPEND>, + <&cru ACLK_USB3OTG0>, <&cru ACLK_USB3_GRF>; + clock-names = "ref_clk", "suspend_clk", + "bus_clk", "grf_clk"; + dr_mode = "otg"; + }; + }; From patchwork Tue Feb 9 19:23:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12078915 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 4B2A0C433E0 for ; Tue, 9 Feb 2021 19:24:14 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C98FC64EB4 for ; Tue, 9 Feb 2021 19:24:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C98FC64EB4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fBtGb353wbEji6pfvTcFJl93KLHw+8VXApNngGPazoU=; b=j5/OSBtA2rgkzWYR3wJBZTbe/G ZBAUkHYMt0znjZrM7AC5DCWRpKtYlMdIiic+tELBxlBvflLJ+jyvbHWkWYM63TrL99Nvar+Y5PLOX tsws7G382UKUcsXXlmJo2xpBinBW7EieF9HCzQMKSwCzIa+IJgkecHDaM6vOzFfvmT8KmrP4Q8RSZ 41eMBa+PLnX8xh/AbRzg13SsqQXe5M6UFdujG3YGh51XrjRQgbQqCjYuWi2lZg1CIeyF0fmzLJ24V duU5vUoZFm4VB8acAAmjvkkMCnXSLey/4C+wGa9EqsieQUaIyO1tTf40exMR9sGvlj3YzbzSjpIHz cDa2vTIA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9YcH-0004tB-Co; Tue, 09 Feb 2021 19:24:05 +0000 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9YcE-0004rR-SI; Tue, 09 Feb 2021 19:24:03 +0000 Received: by mail-ed1-x529.google.com with SMTP id q2so22240355eds.11; Tue, 09 Feb 2021 11:24:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pyReI/BEuC4BzvSRo5mXE3P7CpFBNp0uOKqtRDtZmz0=; b=YJPjb0dS96lYDOexjOydBEkgbTkDbxwnkeUSHVABRARJeOksmXglyDYD2RqyVw3O2E t+EVY/HYTcyuQPEAkxjsWudzToJR098RylZVaKH1Of8kbjRGDnhUfN64E81gKOABvlTN BPs/t2qVYxNAG2t7UXIasMOM9q+jQDV4jJrw72K7hdOKuZAdn7uHWPmj+kh8XogAP30L SHqKpYLguNlitYOH2Ih4GBSHsujJDoOn8KvJ19oO+GMVUp5V2bjf6t8a85fd+zJhhlTp bMNFWbKlGIOe1EmF9QeWKZXkz1AiCvIGuhtWnq35HOS2ukzxBa+E7DK/Dl2kle/gS8gh cVHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pyReI/BEuC4BzvSRo5mXE3P7CpFBNp0uOKqtRDtZmz0=; b=KEwFUiE/h1NYXksLaSioRDwoCK4Qslj23+cYKvMCN/UthutUtVZDr8jsUozruZRXhW i9qGUMTuWYXy8nRY77BnaO96kZa/DNGmwjs4Ii9siFQJD4ipEIghenqxbE0NBRrqeN5T x1f3Wd9xWuSrmBUCuCtB6d3pbMqQdyv5xqcusJU0+/BL74lwPSSKDSNBFf/+uyUXe1O5 OzITRp9aTG+JbR1xFDiw1IBl7/LvJT1GsQr9JFbLc9Qm/XSI5ec5uVjejAqhWZ/AeBLJ Pi71LLwYrfo7ze601kMzmzGiYE2ItwnUE6fP7sBjRqOwuBwWcLfBQS5bOi1Xh3IwK1oQ tNgg== X-Gm-Message-State: AOAM530f7dy2V6PC8BOU5f9pED4F89odOhnQSMKKyhNs0LkG8dDrv7Yy 6hmq0Uu/uV72GMzarfuj4Xo= X-Google-Smtp-Source: ABdhPJz+bOuBJ3/9q6WA9aKGxDaFG4ToV8V9ky4ts+krOYiuFJikzdaJMlOuwtuQTxx8Th0zBx7T9A== X-Received: by 2002:a05:6402:104b:: with SMTP id e11mr22202102edu.367.1612898639910; Tue, 09 Feb 2021 11:23:59 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id w3sm11075779eja.52.2021.02.09.11.23.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2021 11:23:59 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v5 2/8] usb: dwc3: of-simple: bail probe if no dwc3 child node Date: Tue, 9 Feb 2021 20:23:44 +0100 Message-Id: <20210209192350.7130-2-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210209192350.7130-1-jbx6244@gmail.com> References: <20210209192350.7130-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210209_142402_926690_E1DA0003 X-CRM114-Status: GOOD ( 14.45 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org For some of the dwc3-of-simple compatible SoCs we don't want to bind this driver to a dwc3 node, but bind that node to the 'snps,dwc3' driver instead. The kernel has no logic to decide which driver to bind to if there are 2 matching drivers, so bail probe if no dwc3 child node. Signed-off-by: Johan Jonker --- drivers/usb/dwc3/dwc3-of-simple.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/usb/dwc3/dwc3-of-simple.c b/drivers/usb/dwc3/dwc3-of-simple.c index e62ecd22b..347b4d384 100644 --- a/drivers/usb/dwc3/dwc3-of-simple.c +++ b/drivers/usb/dwc3/dwc3-of-simple.c @@ -38,6 +38,10 @@ static int dwc3_of_simple_probe(struct platform_device *pdev) int ret; + /* Bail probe if no dwc3 child node. */ + if (!of_get_compatible_child(dev->of_node, "snps,dwc3")) + return -ENODEV; + simple = devm_kzalloc(dev, sizeof(*simple), GFP_KERNEL); if (!simple) return -ENOMEM; From patchwork Tue Feb 9 19:23:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12078917 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 A4AC6C433E0 for ; Tue, 9 Feb 2021 19:24:24 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3283964ED1 for ; Tue, 9 Feb 2021 19:24:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3283964ED1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=QiYk2YeneAxknBvp3qBqvBvwBcfYMZZYvQx3PAI/uBk=; b=wiaOFE0qYojfS+7QWOP+X90NOG xs4s+sSyqoYvDrQQJqdS0SJ6YmkABm9m6R4jHwUJTCBg21dTObA+9essPKLHYeayfzgWi8uDyu+Kh 9M7tAx/VPtRCBkE6Y478jetzwLwZsV3+9YNobzG4o4uTYRUoFIjlF0iRBCTgEQ9nkSfZt3TWc3pzk m4q+4zPpCOhHBF4LQTQ1wiGSccOf/ynJ9QlkbPh5wW2ATN+eyaVybYjkQUulHcr7OnY7RuNH8hVFw P+A2GbFTGkf6S62vBC9voCbM0HU2j/6zUUIqMRBUDeJqqb/WnnJWFhkWo3ULszQHpQsf6V805Pi1A jrZtRWMQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9YcX-0004yB-1k; Tue, 09 Feb 2021 19:24:21 +0000 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9YcF-0004rk-HO; Tue, 09 Feb 2021 19:24:04 +0000 Received: by mail-ej1-x631.google.com with SMTP id a9so33655250ejr.2; Tue, 09 Feb 2021 11:24:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r7BU1Ua7cwHe6jzoj7pIEXXpfnh5K4Y+YXR073vkvQE=; b=bh1IT2E376Yq6oXbtlLRVU+ZZgwlQGngdXEgtoCLNApGVLxKZgNcwTXuBftb9haijP IIjApj2MGOwBkU4/qoDv8H5kROC7Ft9rXktG0pwxcodKCht0kPvXTv/S5Sw/XF2cBeGd qAwGBS1P4pNyT8b2GVyW1VbiAFE2pbYimxz6Wh3twMtY5kDU0JRy1UKKWpaK6ujwF9SI qp3oeiRdTb0QMw0J4grCoBzbrLvAzZhdNi++4bjwbOkdPCyOyiYcuj5p8D4S+Lwffwzd zTXauPyAD+rCiPkeMGS8u2Z9aqlADrMziri6dNWDPabmtIt8ewRfL1HgSNzN38rADgBh he3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=r7BU1Ua7cwHe6jzoj7pIEXXpfnh5K4Y+YXR073vkvQE=; b=beSumKTgDmZFIL+pV2N+wgfNuxIEJS1G/pj2RhWX1yTnLWGkrd/H5MIlBLtbF1sMH/ 8EYGPV7Sce0Jj8gBp6YtouFWaFJXbSLXZlP/nhFz+qXQcTOymzydxoDUYHJHjYf1U+cx 7Omcz7x0aeLLPlD9XXqtfefTfgQI/Nis168Kenoz8KOeaJuW3WFrvbtaGHtcPO8ANzra HjWsGbCUiNa38WIUoYKZ6LxtDSohjfVNFnKfkClPnc/kczX0kJzQ/XMQDcL+AdOjK7Nb 9Vo/58Yx9xJTL88s3XE200/f0EiIDJIGzFF4zdBCo/P5svrrqgVuBTAXVfXdwTRhTukR PXPw== X-Gm-Message-State: AOAM5337KyBsvELz8Jd/0XMsGR7AqnWIF3WcgIJtG3MOBn3G04H9hfLC 85lCrXmT5ttRBsrHZCZ8akS9hENcOgE= X-Google-Smtp-Source: ABdhPJxKg0jN0s/0ilpBmiIkOppmd8gfTSX0HME5CQ924LQSHlmH/a9j412UFHOcO2XDV1B8AX7bGw== X-Received: by 2002:a17:906:7b8d:: with SMTP id s13mr23864808ejo.479.1612898640598; Tue, 09 Feb 2021 11:24:00 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id w3sm11075779eja.52.2021.02.09.11.23.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2021 11:24:00 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v5 3/8] arm64: dts: rockchip: optimize clks for rk3399 dwc3 Date: Tue, 9 Feb 2021 20:23:45 +0100 Message-Id: <20210209192350.7130-3-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210209192350.7130-1-jbx6244@gmail.com> References: <20210209192350.7130-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210209_142403_660551_8FBC34FB X-CRM114-Status: GOOD ( 12.68 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Wu Liang feng Remove unnecessary clocks, refer to rk3399 TRM, aclk_usb3 is the parent of aclk_usb3otg0/1 and aclk_usb3_grf, and we will enable aclk_usb3otg0/1 and aclk_usb3_grf, so don't need to enable aclk_usb3 again. In addition, the aclk_usb3_rksoc_axi_perf clk is used for usb3 performance monitor module which we don't use now, so don't need to enable it. Signed-off-by: Wu Liang feng Signed-off-by: Johan Jonker --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 04f7cc5c3..b125cac89 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -399,11 +399,9 @@ #size-cells = <2>; ranges; clocks = <&cru SCLK_USB3OTG0_REF>, <&cru SCLK_USB3OTG0_SUSPEND>, - <&cru ACLK_USB3OTG0>, <&cru ACLK_USB3_RKSOC_AXI_PERF>, - <&cru ACLK_USB3>, <&cru ACLK_USB3_GRF>; + <&cru ACLK_USB3OTG0>, <&cru ACLK_USB3_GRF>; clock-names = "ref_clk", "suspend_clk", - "bus_clk", "aclk_usb3_rksoc_axi_perf", - "aclk_usb3", "grf_clk"; + "bus_clk", "grf_clk"; resets = <&cru SRST_A_USB3_OTG0>; reset-names = "usb3-otg"; status = "disabled"; @@ -435,11 +433,9 @@ #size-cells = <2>; ranges; clocks = <&cru SCLK_USB3OTG1_REF>, <&cru SCLK_USB3OTG1_SUSPEND>, - <&cru ACLK_USB3OTG1>, <&cru ACLK_USB3_RKSOC_AXI_PERF>, - <&cru ACLK_USB3>, <&cru ACLK_USB3_GRF>; + <&cru ACLK_USB3OTG1>, <&cru ACLK_USB3_GRF>; clock-names = "ref_clk", "suspend_clk", - "bus_clk", "aclk_usb3_rksoc_axi_perf", - "aclk_usb3", "grf_clk"; + "bus_clk", "grf_clk"; resets = <&cru SRST_A_USB3_OTG1>; reset-names = "usb3-otg"; status = "disabled"; From patchwork Tue Feb 9 19:23:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12078923 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 A4A7CC433E0 for ; Tue, 9 Feb 2021 19:24:50 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1A6C164ED7 for ; Tue, 9 Feb 2021 19:24:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1A6C164ED7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Ns7GLxmLs1hLWG/K7KQZXsN6NUCUiIfhla1pYBPd/vw=; b=AnI7z7KESXJEebtYXgMenTo4j6 fa0qM5H0h+og0aa8YY+ZMNMPvj95yMNf+6Jc96H6NRFkzgSqIrtzEYlJzeTelnFZ9m/YqFyvO16MK Np2Lyh68xZRNoDh/UXEgd1qhH8rqGXNt+mS5suvkJr6BDOaeSwb1UUKPXMBrBHhpAyw2bw4d8lCsd Kx46a2hHW5zwnGNenfnTKr7GlDk8yA1ZEJqckQrQab1AmereaLKG49q9SfoyaNd3EyzrY87Nlj6Y8 Uqt7IIwoJqmw0zt9L02zfoGStfHnQrBjcq3egtEEODGUGdLax3lfZZbZb1nY24jeL0082wqm/Ukvw Au05dZZA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9Ycs-00057A-Cg; Tue, 09 Feb 2021 19:24:42 +0000 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9YcJ-0004rm-5y; Tue, 09 Feb 2021 19:24:11 +0000 Received: by mail-ed1-x52e.google.com with SMTP id s26so19602229edt.10; Tue, 09 Feb 2021 11:24:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QE1vhiNECc3E9Z0FtimepS69tVAk52/C7Hu/jBioBnQ=; b=iuQAOPFi3wriY1+QWL/1sJA0cWtIG50nJzZXxBC7Tkm0ibcXXgMmTcpq74JQcNInqo URe+dYP9oXG+mozJzLLbxjDOSCiy8zrT++/vRPAwilSneuqqQSQk+1xvr3kd16vf1DKE PWaiUpw092xpAVokfTL4qrKyLwqMiuxrxQDKaNfCC2kHDMQhSibM39tGqkS7O1AI6w+U JLQ9l69es2ObakYL01TQV1ToJLdf+g0g1LvqDPW4UqmtqrwVD4r4RJA0t1PLgXqVGPOA TMzmyYa8P9iN06y1ES+VSENwLrG7Jm7QjX31sKv2B81KNY2EZFTuvDd7w2zHBPxAeszN OyYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QE1vhiNECc3E9Z0FtimepS69tVAk52/C7Hu/jBioBnQ=; b=PK/ErS8MIN6th8hmEtp/hDlX2ospGPtMTuZfqlZ0gJGqkw97xhbV/AhXpwaUOlUHiY LKaG2eEhhE+N+viSeOk8wSrr8JtM8rYqK8NyM01f5gVDhUDYShZW67Sr3AsxPRS1Xgfn 9pijArTcBhuYalQ5iN5HdQJklpsapm1rXpte5O0XhaGhW0zBPvaQD0QuLJnhJ/kFYglE ol6kelQ50ueS0qp2KVyaq02bdbNdz0jIkbVzhuLVHfR4KlOJN6084lUPY7z5W7MVELB0 aSZOw17XJjA4K/l/rlG7hH5bbEAAfObV4pmzbnXeaGj1ctvjBeNntsmuA2eSlLPNmEqj 8OTg== X-Gm-Message-State: AOAM533axflBwUoH0VXBj89PE9xTexpRHg6uo0QaMFsu4KVbtvZMhiii bNbKQHCxR7YGyF+RsUOiLVw= X-Google-Smtp-Source: ABdhPJxwCYKEQZ4ND/Nf7Hj4paZ1niOmWCNeh/ovmCCE1BbJ/Jb6Asm5SqRNU1HIvBxeR1JfzwGpRA== X-Received: by 2002:aa7:cd62:: with SMTP id ca2mr3829237edb.94.1612898641723; Tue, 09 Feb 2021 11:24:01 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id w3sm11075779eja.52.2021.02.09.11.24.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2021 11:24:01 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v5 4/8] arm64: dts: rockchip: restyle rk3399 usbdrd3_0 node Date: Tue, 9 Feb 2021 20:23:46 +0100 Message-Id: <20210209192350.7130-4-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210209192350.7130-1-jbx6244@gmail.com> References: <20210209192350.7130-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210209_142407_505084_CD2E0D94 X-CRM114-Status: GOOD ( 13.23 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org For rk3399 dwc3 usb the wrapper node for only clocks makes no sense, so restyle the rk3399 usbdrd3_0 node before more new SoC types are added with the same IP. Signed-off-by: Johan Jonker --- Changed V3: remove aclk_usb3_rksoc_axi_perf remove aclk_usb3 --- arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 6 +--- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 6 +--- arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 6 +--- .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 6 +--- arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 6 +--- arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 4 --- arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 6 +--- .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 4 --- .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 4 --- arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 4 --- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 6 +--- arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 4 --- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 6 +--- arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 6 +--- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 37 ++++++++-------------- .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 4 --- 18 files changed, 24 insertions(+), 95 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts b/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts index 1ce85a581..95110d065 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts @@ -153,7 +153,7 @@ status = "okay"; }; -&usbdrd_dwc3_0 { +&usbdrd3_0 { dr_mode = "host"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts index 6db18808b..4017b0e8c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts @@ -773,12 +773,8 @@ }; &usbdrd3_0 { - status = "okay"; -}; - -&usbdrd_dwc3_0 { - status = "okay"; dr_mode = "otg"; + status = "okay"; }; &usbdrd3_1 { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi index 32dcaf210..e42783cb7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -618,13 +618,9 @@ ap_i2c_audio: &i2c8 { }; &usbdrd3_0 { - status = "okay"; + dr_mode = "host"; extcon = <&usbc_extcon0>; -}; - -&usbdrd_dwc3_0 { status = "okay"; - dr_mode = "host"; }; &vopb { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts b/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts index 341d074ed..daf14f732 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts @@ -731,12 +731,8 @@ }; &usbdrd3_0 { - status = "okay"; -}; - -&usbdrd_dwc3_0 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &usbdrd3_1 { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi index 635afdd99..d028285fb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi @@ -797,12 +797,8 @@ }; &usbdrd3_0 { - status = "okay"; -}; - -&usbdrd_dwc3_0 { - status = "okay"; dr_mode = "otg"; + status = "okay"; }; &usbdrd3_1 { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts b/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts index 1fa80ac15..1c0b48a71 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts @@ -611,12 +611,8 @@ }; &usbdrd3_0 { - status = "okay"; -}; - -&usbdrd_dwc3_0 { - status = "okay"; dr_mode = "otg"; + status = "okay"; }; &usbdrd3_1 { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi index 76a8b40a9..90a6ea1d7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi @@ -715,10 +715,6 @@ status = "okay"; }; -&usbdrd_dwc3_0 { - status = "okay"; -}; - &usbdrd_dwc3_1 { dr_mode = "host"; status = "okay"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts index ad7c4d008..7b633622c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts @@ -854,12 +854,8 @@ }; &usbdrd3_0 { - status = "okay"; -}; - -&usbdrd_dwc3_0 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &usbdrd3_1 { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts index 219b7507a..f00e11075 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts @@ -1086,10 +1086,6 @@ }; &usbdrd3_0 { - status = "okay"; -}; - -&usbdrd_dwc3_0 { dr_mode = "host"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts index a8d363568..35780506c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts @@ -223,10 +223,6 @@ }; &usbdrd3_0 { - status = "okay"; -}; - -&usbdrd_dwc3_0 { dr_mode = "otg"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi index 20309076d..4d30c1b32 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi @@ -792,10 +792,6 @@ status = "okay"; }; -&usbdrd_dwc3_0 { - status = "okay"; -}; - &usbdrd3_1 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi index fb7599f07..69c067dd1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -668,12 +668,8 @@ }; &usbdrd3_0 { - status = "okay"; -}; - -&usbdrd_dwc3_0 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &usbdrd3_1 { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts index b20774081..20c3ef9fc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts @@ -164,7 +164,7 @@ }; }; -&usbdrd_dwc3_0 { +&usbdrd3_0 { dr_mode = "otg"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi index 5e3ac589b..3920dcbd1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi @@ -635,10 +635,6 @@ status = "okay"; }; -&usbdrd_dwc3_0 { - status = "okay"; -}; - &usbdrd3_1 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi index 580972459..564b56810 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi @@ -817,12 +817,8 @@ }; &usbdrd3_0 { - status = "okay"; -}; - -&usbdrd_dwc3_0 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &usbdrd3_1 { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi index 701a567d7..2e76f178e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -614,12 +614,8 @@ }; &usbdrd3_0 { - status = "okay"; -}; - -&usbdrd_dwc3_0 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &usbdrd3_1 { diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index b125cac89..cfde6cc64 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -394,37 +394,26 @@ }; usbdrd3_0: usb@fe800000 { - compatible = "rockchip,rk3399-dwc3"; - #address-cells = <2>; - #size-cells = <2>; - ranges; + compatible = "rockchip,rk3399-dwc3", "snps,dwc3"; + reg = <0x0 0xfe800000 0x0 0x100000>; + interrupts = ; clocks = <&cru SCLK_USB3OTG0_REF>, <&cru SCLK_USB3OTG0_SUSPEND>, <&cru ACLK_USB3OTG0>, <&cru ACLK_USB3_GRF>; clock-names = "ref_clk", "suspend_clk", "bus_clk", "grf_clk"; + dr_mode = "otg"; + phys = <&u2phy0_otg>, <&tcphy0_usb3>; + phy-names = "usb2-phy", "usb3-phy"; + phy_type = "utmi_wide"; + power-domains = <&power RK3399_PD_USB3>; resets = <&cru SRST_A_USB3_OTG0>; reset-names = "usb3-otg"; + 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; status = "disabled"; - - usbdrd_dwc3_0: usb@fe800000 { - compatible = "snps,dwc3"; - reg = <0x0 0xfe800000 0x0 0x100000>; - interrupts = ; - clocks = <&cru SCLK_USB3OTG0_REF>, <&cru ACLK_USB3OTG0>, - <&cru SCLK_USB3OTG0_SUSPEND>; - clock-names = "ref", "bus_early", "suspend"; - dr_mode = "otg"; - phys = <&u2phy0_otg>, <&tcphy0_usb3>; - phy-names = "usb2-phy", "usb3-phy"; - phy_type = "utmi_wide"; - snps,dis_enblslpm_quirk; - snps,dis-u2-freeclk-exists-quirk; - snps,dis_u2_susphy_quirk; - snps,dis-del-phy-power-chg-quirk; - snps,dis-tx-ipgap-linecheck-quirk; - power-domains = <&power RK3399_PD_USB3>; - status = "disabled"; - }; }; usbdrd3_1: usb@fe900000 { diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi index 7257494d2..810fb7880 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi @@ -454,10 +454,6 @@ status = "okay"; }; -&usbdrd_dwc3_0 { - status = "okay"; -}; - &vbus_host { enable-active-high; gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>; /* USB1_EN_OC# */ From patchwork Tue Feb 9 19:23:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12078927 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 9E6F9C433E0 for ; Tue, 9 Feb 2021 19:25:07 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2745F64ED0 for ; Tue, 9 Feb 2021 19:25:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2745F64ED0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=eEIll1HnRIk/UDDJVOBq1rqS+aNNXo4uZAu9pUjTBuM=; b=kPQp/rldVZ8VaYl8+DLlguqhkZ 2FS2h7uGVoLV4BdDsC1GbrTNw+nqRJH+C5YLimyiCTRbLIZr/7y2ojoFWHerN02Yt82FLqr3qjvsF qqDH8IICUFsMxRHMPFka4LYdFENPf73/azY2EyKzuxJSELaNYLLyU36M+kmbww8fXnDimyoftJ6Vq N1SYEZUTzddnIz5Lz//NGDyle5I30kq/P0+jZ72JvWmv3Q7IOp3sLJaJos/asdZnNGKPyi4dZmS6A 5E/VKW8Ubj9g66+9BDylxAtOhFe1/I6jdMxvbYt5F09Selrzw9zjikZh/cUAeEfoV8kBm6/cEFMwf TirplpyQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9Yd9-0005GZ-EY; Tue, 09 Feb 2021 19:24:59 +0000 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9YcJ-0004sI-El; Tue, 09 Feb 2021 19:24:14 +0000 Received: by mail-ed1-x52d.google.com with SMTP id s5so25371217edw.8; Tue, 09 Feb 2021 11:24:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/a0aAjzQjJH2QwSKfKzXVA6KoKVTm9tiHyx2LD5lv90=; b=CzKbw/+AA/yPn/TfMwQQj4qLFrwYuJikMBLMztWcqpVJtgm6nl6qvqP4cnV03vbIxi Ivf0oxE0kQSJXGKDYGnweujfG/G9TqSLvgEkbNP5u1DIwGt9w/TQ+7dennkIZjW89BLP 2invkEUIj41w8OEV6pJ4mVFMjuUxvUlrZ9HBKItXD8C/Wb8LXfxbY4l5rSSyFcLsNPSi XSDPPPjFy3yqoXTPYXPb5HuCeLuIBADeamOkpkZJ2VnrgWTeaudHsLCar2mtnFpJ2bNA fj5fczuI3yrUjglasGpHFl1PyFmWrch2R/nldr9L57iyXOf01yqv3OFv2BbOyeBm+qJ1 h4rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/a0aAjzQjJH2QwSKfKzXVA6KoKVTm9tiHyx2LD5lv90=; b=coPaq1pkjztdSNTVzCCZPU6j/nrGsPppDsOkbsdYEvgDM+V/mXVj83EnUA8lkjcpXT TEIlY7Tng0LHYeDjxxdATJe49kz4dY0P/a6NeWB/I/r9XX6qPwjXdzrEMfsVZ2DdhzXD K0Hb8IlZDCAVx3/riWsuBPVI4PaVcsNFsgClUKw+1elWtK9kqa//HwER+m1c1bDBurTr B32tVugWobWR4CyrQSjGagz/lqAXdR28+cOTy9I8USDhEJrWqRCxig03XyQQJ1ujZJCq z3vb53Tx1I6aIOfHzg116Ql8mbsmXwzjkvIFfAqRcX/FKlNWu/U/U/XFjHB4UI1uyiEa 1X1w== X-Gm-Message-State: AOAM533fp/A5tO7Uq74TFEqpt1X/YMyeXa4H/g193eBpJXYAjsS/yHVR aqm5YPN8Iq11AitMSC13/WpBQejZ/K4= X-Google-Smtp-Source: ABdhPJy5HiXgKK559jU62H4HCm72H289cWpUXt4ZF2qfZAtv3X6VGo6bkEd2IaSRw+lVn9l6rDZLLQ== X-Received: by 2002:aa7:c80a:: with SMTP id a10mr24616898edt.141.1612898642789; Tue, 09 Feb 2021 11:24:02 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id w3sm11075779eja.52.2021.02.09.11.24.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2021 11:24:02 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v5 5/8] arm64: dts: rockchip: restyle rk3399 usbdrd3_1 node Date: Tue, 9 Feb 2021 20:23:47 +0100 Message-Id: <20210209192350.7130-5-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210209192350.7130-1-jbx6244@gmail.com> References: <20210209192350.7130-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210209_142407_723742_225EE337 X-CRM114-Status: GOOD ( 13.08 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org For rk3399 dwc3 usb the wrapper node for only clocks makes no sense, so restyle the rk3399 usbdrd3_1 node before more new SoC types are added with the same IP. Signed-off-by: Johan Jonker --- Changed V3: remove aclk_usb3_rksoc_axi_perf remove aclk_usb3 --- arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 6 +--- .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 6 +--- arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 6 +--- .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 6 +--- arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 6 +--- arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 4 --- arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 6 +--- .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 4 --- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 6 +--- arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 6 +--- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 6 +--- arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 4 --- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 6 +--- arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 6 +--- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 37 ++++++++-------------- 17 files changed, 26 insertions(+), 93 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts b/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts index 95110d065..4392780db 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts @@ -157,7 +157,7 @@ dr_mode = "host"; }; -&usbdrd_dwc3_1 { +&usbdrd3_1 { dr_mode = "host"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts index 4017b0e8c..28e5895de 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts @@ -778,12 +778,8 @@ }; &usbdrd3_1 { - status = "okay"; -}; - -&usbdrd_dwc3_1 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &vopb { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi index 1384dabbd..c996c688d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi @@ -351,13 +351,9 @@ ap_i2c_tp: &i2c5 { }; &usbdrd3_1 { - status = "okay"; + dr_mode = "host"; extcon = <&usbc_extcon1>; -}; - -&usbdrd_dwc3_1 { status = "okay"; - dr_mode = "host"; }; &pinctrl { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts b/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts index daf14f732..397050703 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts @@ -736,12 +736,8 @@ }; &usbdrd3_1 { - status = "okay"; -}; - -&usbdrd_dwc3_1 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &vopb { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi index d028285fb..30e6e3e41 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi @@ -802,12 +802,8 @@ }; &usbdrd3_1 { - status = "okay"; -}; - -&usbdrd_dwc3_1 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &vopb { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts b/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts index 1c0b48a71..a7092fda3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts @@ -616,12 +616,8 @@ }; &usbdrd3_1 { - status = "okay"; -}; - -&usbdrd_dwc3_1 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &vopb { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi index 90a6ea1d7..1e835a682 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi @@ -712,10 +712,6 @@ }; &usbdrd3_1 { - status = "okay"; -}; - -&usbdrd_dwc3_1 { dr_mode = "host"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts index 7b633622c..fdc027ff3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts @@ -859,12 +859,8 @@ }; &usbdrd3_1 { - status = "okay"; -}; - -&usbdrd_dwc3_1 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &vopb { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts index f00e11075..80ac8ab6a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts @@ -1091,10 +1091,6 @@ }; &usbdrd3_1 { - status = "okay"; -}; - -&usbdrd_dwc3_1 { dr_mode = "host"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi index 4660416c8..2f12e4a7d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -517,12 +517,8 @@ }; &usbdrd3_1 { - status = "okay"; -}; - -&usbdrd_dwc3_1 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &usb_host1_ehci { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi index 4d30c1b32..f15f85162 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi @@ -793,12 +793,8 @@ }; &usbdrd3_1 { - status = "okay"; -}; - -&usbdrd_dwc3_1 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &vopb { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi index 69c067dd1..f07f49f45 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -673,12 +673,8 @@ }; &usbdrd3_1 { - status = "okay"; -}; - -&usbdrd_dwc3_1 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &vopb { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts index 20c3ef9fc..e22995c8e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts @@ -168,7 +168,7 @@ dr_mode = "otg"; }; -&usbdrd_dwc3_1 { +&usbdrd3_1 { dr_mode = "host"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi index 3920dcbd1..b5f23661e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi @@ -639,10 +639,6 @@ status = "okay"; }; -&usbdrd_dwc3_1 { - status = "okay"; -}; - &vopb { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi index 564b56810..be5b1c7e1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi @@ -822,12 +822,8 @@ }; &usbdrd3_1 { - status = "okay"; -}; - -&usbdrd_dwc3_1 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &vopb { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi index 2e76f178e..fe9d4b2f8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -619,12 +619,8 @@ }; &usbdrd3_1 { - status = "okay"; -}; - -&usbdrd_dwc3_1 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &vopb { diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index cfde6cc64..a63806b30 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -417,37 +417,26 @@ }; usbdrd3_1: usb@fe900000 { - compatible = "rockchip,rk3399-dwc3"; - #address-cells = <2>; - #size-cells = <2>; - ranges; + compatible = "rockchip,rk3399-dwc3", "snps,dwc3"; + reg = <0x0 0xfe900000 0x0 0x100000>; + interrupts = ; clocks = <&cru SCLK_USB3OTG1_REF>, <&cru SCLK_USB3OTG1_SUSPEND>, <&cru ACLK_USB3OTG1>, <&cru ACLK_USB3_GRF>; clock-names = "ref_clk", "suspend_clk", "bus_clk", "grf_clk"; + dr_mode = "otg"; + phys = <&u2phy1_otg>, <&tcphy1_usb3>; + phy-names = "usb2-phy", "usb3-phy"; + phy_type = "utmi_wide"; + power-domains = <&power RK3399_PD_USB3>; resets = <&cru SRST_A_USB3_OTG1>; reset-names = "usb3-otg"; + 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; status = "disabled"; - - usbdrd_dwc3_1: usb@fe900000 { - compatible = "snps,dwc3"; - reg = <0x0 0xfe900000 0x0 0x100000>; - interrupts = ; - clocks = <&cru SCLK_USB3OTG1_REF>, <&cru ACLK_USB3OTG1>, - <&cru SCLK_USB3OTG1_SUSPEND>; - clock-names = "ref", "bus_early", "suspend"; - dr_mode = "otg"; - phys = <&u2phy1_otg>, <&tcphy1_usb3>; - phy-names = "usb2-phy", "usb3-phy"; - phy_type = "utmi_wide"; - snps,dis_enblslpm_quirk; - snps,dis-u2-freeclk-exists-quirk; - snps,dis_u2_susphy_quirk; - snps,dis-del-phy-power-chg-quirk; - snps,dis-tx-ipgap-linecheck-quirk; - power-domains = <&power RK3399_PD_USB3>; - status = "disabled"; - }; }; cdn_dp: dp@fec00000 { From patchwork Tue Feb 9 19:23:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12078921 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 2169CC433E0 for ; Tue, 9 Feb 2021 19:24:45 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A1DD864ED5 for ; Tue, 9 Feb 2021 19:24:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A1DD864ED5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tzOcevjknt7pZYTvi9mEWby3GCW6MvYPvRSJMyb5Q/g=; b=BVlwyAwo5qf5u7F+XZwNqhluoN mEjvVtehEMk+SG9x/m/aVKLr6HQU1xZucqhIyh/Y/cpQuR4XoOfgWi7fKxzlY7WMju2bIgE27Qp4R F0PTto6/wlh24mzbV/0A3wJplOo3sUUeLqrChpQai2+q4mL1SC44I9Qd9UWf+9P9zPRF+Ya5EwsVF SLnkJxQFo169afLljAjUxcbCbTtogCxid/rdNXcyZlt8UoesC05YrckgXHUpDOYixTozMZgHwN1gG XK2kT6FTKB9jeqfBKFRdX1wiFU+R/63AsUg79tq/kETnXLOSjN74ve4FqJ9m+jrvlSJF4zCPMFvWc RFph1aeQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9Ycp-00056S-Ve; Tue, 09 Feb 2021 19:24:40 +0000 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9YcJ-0004sj-5x; Tue, 09 Feb 2021 19:24:09 +0000 Received: by mail-ej1-x62e.google.com with SMTP id y9so33605980ejp.10; Tue, 09 Feb 2021 11:24:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=14H0f5aEEI+2zFgxOySJ5VK8BkDHBP5qJGIxOOYhz58=; b=gMAIk/S9I3iFVCWESma9i7AuSTvZUJpJ5rqGwM8rphZJSjmYSw5wDTa40bpLw7B7Vz ZAydfmL8j7caXzB+o3mgGViApPbVoDbzcrw+wF0Hxzao9IrV+Fg3DjBO8I1X1aeAjegb /kYh2JBnjBpV/7Cj1idcONsm95EX9bbQmltv8johxwzcI+PLzSMPQiG0i7NSWYbVReP9 xgUZxPgwZEigzqT5kFKMx61X2h3LXiyat0XAezx3zx4sdKcuAJUi/VcQjgjdJ3sbJgIE MQrAdtkVGTL+IeOpuylHqMZPZRncZw/HCsUZn5AZ8OHrwPu0j735rZkYRBQlzGRCh7Es AjCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=14H0f5aEEI+2zFgxOySJ5VK8BkDHBP5qJGIxOOYhz58=; b=rPMyCPV+rG6lJV0X6h7L0LQVYQlaOn253PBMOF85fPCsC8bSM/L3GXtUTK/Vgm01wY JcJ7P7eYZvYM4D7SednIbYhRsJUc8bnjq6dDlrIKzeLqhwXvKO+1rrGH4NYmMkVEGv6I pJKDvNJufHoEZZMxN1m3PNIh06kDXd787AZ0n/0E8eJu8RZw4VixuE9q8x6VSKsvdbnG YDvvwQmxRGRevCaDVbwWL2tU9vxkVt35xGKnk8cM47bQpxf21ZweIhaO/t9uxT4qGlxu mC2rqelMyKLQkHtVRgqGzEbraTlbdVfGYKsxGIIKt0XBQlMUDc1ebIU40yH5nc4R4vqO lHqw== X-Gm-Message-State: AOAM532Lr73Vjrar5b5NRFlXXxYJfnGw0oJ/jw7HtgRt0JJbSRIKjBEW wO3Oypcrflf3N0epCj+xIY+I/JVtcmo= X-Google-Smtp-Source: ABdhPJx8ip8GJWyWEYn2wFpemRPOtuTEtwjD2rTTvXHwWcTT8F0MeWmHOPwUVBGO9at+rVhb13/wug== X-Received: by 2002:a17:907:1181:: with SMTP id uz1mr24534030ejb.60.1612898643445; Tue, 09 Feb 2021 11:24:03 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id w3sm11075779eja.52.2021.02.09.11.24.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2021 11:24:03 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v5 6/8] dt-bindings: usb: dwc3: add description for rk3328 Date: Tue, 9 Feb 2021 20:23:48 +0100 Message-Id: <20210209192350.7130-6-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210209192350.7130-1-jbx6244@gmail.com> References: <20210209192350.7130-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210209_142407_418485_F47C7959 X-CRM114-Status: GOOD ( 11.56 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Add description for "rockchip,rk3328-dwc3". Signed-off-by: Johan Jonker Reviewed-by: Rob Herring --- Changed V5: add select --- Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml b/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml index 9908270a9..04077f2d7 100644 --- a/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml +++ b/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml @@ -28,6 +28,7 @@ select: compatible: contains: enum: + - rockchip,rk3328-dwc3 - rockchip,rk3399-dwc3 required: - compatible @@ -36,6 +37,7 @@ properties: compatible: items: - enum: + - rockchip,rk3328-dwc3 - rockchip,rk3399-dwc3 - const: snps,dwc3 @@ -46,6 +48,7 @@ properties: maxItems: 1 clocks: + minItems: 3 items: - description: Controller reference clock, must to be 24 MHz @@ -58,6 +61,7 @@ properties: Controller grf clock clock-names: + minItems: 3 items: - const: ref_clk - const: suspend_clk From patchwork Tue Feb 9 19:23:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12078925 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 D4BE2C433E0 for ; Tue, 9 Feb 2021 19:24:58 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 68A5E64ED0 for ; Tue, 9 Feb 2021 19:24:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 68A5E64ED0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VCmjU/ZD/HGe4mKI27sHncC4gl5rKjN96TI0xNFsQQg=; b=ZbSicOuE6wNmv8Szw/KIT0ISxP xfZJN2h4Eu8tv3OsOnI5l/3OADQlS90ibOdI2KcgFuxwBsXFRq2eC1g86m69ZXgpfPBt5s/JFaYt1 iLe4wJQ83qF4A2Ba1d1oAWcoRlxTtfuimOwLOLLokC/KmRo8zohUQwD6Onq1Apb8S7N+dN5wo+RzH Rr7+zpz7Ed/JPJ5ULbZdhCIqEWnHxPIdclEJ6r+UyjmwEWNUaQfPfx+eXvnJknoG9SCyLV3ExdrdZ /LGcZkuGxAFRND/Sd3walKIm8t6mweY77jWY9F3STDxeYRB+bduGUcfOlrW9juMCFuevWKtqAR/WX rqsmgjSQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9Yd4-0005DO-2e; Tue, 09 Feb 2021 19:24:54 +0000 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9YcJ-0004su-Pz; Tue, 09 Feb 2021 19:24:13 +0000 Received: by mail-ej1-x62c.google.com with SMTP id a9so33655554ejr.2; Tue, 09 Feb 2021 11:24:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CZhB/NEJnRkF+TAIIRVQHf9Sf3lp8bbtJmnwDMjx8Fs=; b=Pyc5ziHzNys/DmCyRT/IZGIkNcdwW2jRgLCnoc4oF8HBHLtJtCiv0kUD4zYNFyZa4x tsRhEQYCT38Fd0H0Abr+owIadmo000OiOsBVbBNY1c8lq3yyGFhiywtPmdB7SyMr5xA/ 7dBhgbhf/lMMhbEgEaCYOGL4y0SfCsw4OVoGRNaMuAysPUZRXX3C/Wugdz54W7NIbzAK yIniVvoW90wX2vxClo30xhcM7wj1eziBRUrwCR6I5t/+WoNaR5JPaNVcK/+6JIdpUcIe 6dUXHGldLgGppakAV4WYu17hJEALqICRYPfKCuRUrNRfhcirmZLe83WLPPMg9xbfeuu8 MX9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CZhB/NEJnRkF+TAIIRVQHf9Sf3lp8bbtJmnwDMjx8Fs=; b=l/UnONg9nqyRsfhun0Cp+aat90v0oJYtsYYLWs9bfnC4c15bGZAfM9ArFiV0u/gGy4 vlbAIdf/o9ymHi8fFHLo4doxgsX2+AgXeyBBu4FsPdBpVlJ21oXgkNFZu/ktuiLSHBYG /WCe5dWarXCuMtRRswWkLdBNToql818YPMkrhOjQGebUZNdLTvbUlKTAItkwXziBkliz frih9dyyGOmIQ06xRo2+ZkgTCXz90hFdRWcd1YOKsB7u8mKW2KSireWWflrZhHMs8rvz IuauvERzgrQOsk0uUdPT9D6qYqxfzrD3f2m8849d3QrJJFBRQtThaECx879nAT7ARgOO nMcg== X-Gm-Message-State: AOAM532VvYi9mUBbyGAnk8wQQHLgQjb5VUx7dt6uWIWiqwJeuJF5o94H iLjrMF0HE3IKQlc3QHBTO44= X-Google-Smtp-Source: ABdhPJyq2Hl1AVM7CRPhdEGtJGkzjJIdzCmDQRstMgdguIQWb8IxLBedrovs7JsXiNbv5ZgVdfF2Tw== X-Received: by 2002:a17:906:6449:: with SMTP id l9mr24927901ejn.320.1612898644183; Tue, 09 Feb 2021 11:24:04 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id w3sm11075779eja.52.2021.02.09.11.24.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2021 11:24:03 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v5 7/8] arm64: dts: rockchip: add rk3328 dwc3 usb controller node Date: Tue, 9 Feb 2021 20:23:49 +0100 Message-Id: <20210209192350.7130-7-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210209192350.7130-1-jbx6244@gmail.com> References: <20210209192350.7130-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210209_142408_058543_94335596 X-CRM114-Status: GOOD ( 12.24 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Cameron Nemo 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: Heiko Stuebner Signed-off-by: Cameron Nemo Signed-off-by: Johan Jonker --- Changed V2: remove node wrapper --- 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 4d4cd1830..a3b069a10 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -988,6 +988,25 @@ 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 Tue Feb 9 19:23:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12078919 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 D267DC433E0 for ; Tue, 9 Feb 2021 19:24:33 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3D81864ED5 for ; Tue, 9 Feb 2021 19:24:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D81864ED5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1wYuQSMs/HQj22FodCh/I/7QTsIRB09Jx+k5jfG5yZ0=; b=SdBqC+7z1ZMQX0LPTPJx/GaLBW cuRzNO0em4HXqaQ/NR6LtVsOSmvqJOhTpu4iq0EPZAZF8yLOKCqBT5MZthThMfvV+SSSuAn6o9M6v q0BLThCrs5uUU6ZqZ97QHMvYtBnxAL01Y6q+Rz6+UWRsUsZCXuTaFh7OPt7noqZsiwM9l3RJc4knC 7zDOpRWPQWLSDtmlbuztQu8e/aQRSISmNAtnb2CrxLYmZvgMYFvq5vq89nYl38Ncl8G4avwOOSDT7 IirSqMgli/Zskxtv0ahUuQCT+YWmFJlB2nWFK06LeKIyonDlvY2UjuD6gB82iXdpOjkrEFCY0y7LF jZcWuStw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9Ycc-00050Q-J8; Tue, 09 Feb 2021 19:24:26 +0000 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9YcI-0004t8-4d; Tue, 09 Feb 2021 19:24:07 +0000 Received: by mail-ej1-x62d.google.com with SMTP id w1so33597623ejf.11; Tue, 09 Feb 2021 11:24:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VKpw+TGxcSonBmJvYVbjnLKEXkavUls9cDkglgeREzs=; b=HO1rEER2rQ/ib60OX4LykRzzHUV7TK6M7FXnGi0rK0kf7M3lRCrxd5vuud4Y69slyc gcJcjDFwAEKBdd+CV7Gdib0WaDgHMbaLMAOqwcG29CQeTgTSv609bh1St5YhZ6hOsqqF dDW3AWzG1b8Qti44pryaVZ/3AdrFfSX9D6q0kPADnuf3JVyEBXU0hpDflZXLPyS8FBmP HWCk8sOTr0s4EiNvcw9auqxdZnmoi0Qh+y3CnG4UVM7wkkvzxIRJedjelEyYsRDqxzro U2O0iq8BSbNG3VEySL8f/ZrCDoLuvevjlzBFvHyeSwKavRzoA4RxaSDNIne33B53yQCr U/EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VKpw+TGxcSonBmJvYVbjnLKEXkavUls9cDkglgeREzs=; b=p+AfgyPJUVnsOuZanoR5OsE4Qc3k1IH7pV1B30wQZXN7q2gDD9r9LnxkC7AkJ9x7Gr bZXPGxgzmPUumnaxPaesrWiS+nViXgOirHaU4t7FuM77mfC/yLU9Lj1p5AIAT5PE3yjR PUVz6o43MQ9WfRtms2KY2sM2SJftnCoglI0SuZbmDZzMKrKSROySPXr5cfoN/o6tKX1W LMDn1eEd94FrBISgMQursH8CniN082t7BRDrQzlDnWOujHVNWANkXggcVLts4WTajyha 8njvYNG//hMBs3xk4XzBllTaUhcT3nBYsPPOUvSpPzp+6+AvinyFhfdUWk6lVk8DEmS/ 2gLA== X-Gm-Message-State: AOAM532hTwIH3H6dArxLprmSZnaYbEONex1pZQZe9Kz8/ALpRF+bkkJP 6qksYufP+gmVC+724MNGPiLKMn5JaRI= X-Google-Smtp-Source: ABdhPJw9959wQBn5cvY2Fqpt5Xz+QaWW6YioQ2FYuvburiVrHGpT8oFcjVbVZLt3nDg+4Z/13u4xQA== X-Received: by 2002:a17:906:b752:: with SMTP id fx18mr24723372ejb.17.1612898644828; Tue, 09 Feb 2021 11:24:04 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id w3sm11075779eja.52.2021.02.09.11.24.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2021 11:24:04 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v5 8/8] dts64: rockchip: enable dwc3 usb for A95X Z2 Date: Tue, 9 Feb 2021 20:23:50 +0100 Message-Id: <20210209192350.7130-8-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210209192350.7130-1-jbx6244@gmail.com> References: <20210209192350.7130-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210209_142406_263235_BE8F485F X-CRM114-Status: GOOD ( 11.85 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Enable dwc3 usb for A95X Z2. Signed-off-by: Johan Jonker --- Changed V2: remove node wrapper --- arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts b/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts index 30c73ef25..e71870768 100644 --- a/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts @@ -357,6 +357,11 @@ status = "okay"; }; +&usbdrd3 { + dr_mode = "host"; + status = "okay"; +}; + &usb_host0_ehci { status = "okay"; };