From patchwork Sat Feb 6 18:50:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12072293 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 F1439C433E0 for ; Sat, 6 Feb 2021 18:50:48 +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 9470F64E64 for ; Sat, 6 Feb 2021 18:50:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9470F64E64 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=sE+KNGcqjQNZiKkyZyyKTAMypCPevAHyuJz5IBUHcnk=; b=1lp7+c1qVC+u4Sv0s8CuS8gry6 3/RYifVW1SrG1GmJbazLXgk1eLewC6FhGPZ6oHV+nIX9oc1RNJYYVoE+upmH/a8vfsChd5s5bzTsB 3OfEsEeV8EwVvd77+h0kzx1hFA1A0vAWMVnNQnlYAmK8UEIMaSEpcaLloMlZPRh00BRcUO4d54x0Z lGPcs8PygC94go/LsAtebt+jF3RZ8L0azkD25FhRVnns3x8QvWfahFU/BMou7DK+B/Rx/xlNdsDM6 rCC5oXbFy4Y4Wf+ifw1S6q7DKOYI/5U0CCypw6LdEGZuvv4Zfdl3OuGomsgkmE2Rys5ioXrtQRYEV KKYH+rgA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8SfJ-0003xE-PM; Sat, 06 Feb 2021 18:50:41 +0000 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8Sf7-0003sl-49; Sat, 06 Feb 2021 18:50:33 +0000 Received: by mail-ed1-x535.google.com with SMTP id c6so13431787ede.0; Sat, 06 Feb 2021 10:50:26 -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=bP2TkjSLtuteWO1JClrvBULCopI78AgBBGVLp8X9jmQ=; b=IbVYJ/q8Z7A6d/Xr02l4CahlviL1LKWrvb5J55d6X8YEJcjlKMfavAmc0/gfUQLeC0 wt8pBLwvDmb7mAdrO2g+TvAZ+ZPZnsD2cef8FAxa4WR7aRHhsmVhYABN0zN0bI0w3AAz +foSuKIdfEdlWd8O5Y2TLGcEpIGAPqjzQMarpVcCNiu4t2iPFxhQuhvdZO3AuiPaqEua TLMuOldX6eRs23HWyFYO0KQnltST447KN8eU2t5GxisoA0c/N9jHdapoROCy1p1A/b/A KgZ5NkOEYgE77xxF7KRzkf97m2aySfqkdTZDQZp9KgZa0KjUZYl0KffBy7vjpvDU87eF HSdA== 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=bP2TkjSLtuteWO1JClrvBULCopI78AgBBGVLp8X9jmQ=; b=QrDLPykwYcAccBE50WUxCH+kJ7UI3Jl2iJUtVPOJG/MIi+7QCgwHzjrAerJBgqLqPb RVh3JFqjOjM5A0G6dw88eBFlJq5/WE8f1Rzwwq+FThp/oWZQsvy4aDVLEdoUxMlHlTHt 2KfkzL/l0HH3xhbV7fxFEwkfj/BAW6sEVrIdlBM0Z8yo8lOySqbmP0xk/W2erWPVc7Gq ics6tIBuIHNpvll04E4M+VAtJ3Gozj2S/hBvJwi+XQ281vgB/C5iEvHSCHLD9bo6xT+e SQlDjqODrcDxxN1i0FYeshtEd5jRi6dJuzgOSnsSvkPjWNr6ydtCgBI/v45sqxQADDq8 FduQ== X-Gm-Message-State: AOAM5309J5fmcIEW7g2GSVopartdpFl/4WjNx8b5oQrrRQdN75tbAgs0 jD3Lp6irUhA+bYNyEsZTUbRjvPY4Fdk= X-Google-Smtp-Source: ABdhPJzUaY32Do01BL+HSNCqVecost6y7Df+ZCiCLRaYiYPG5W6KhJek61a00VsrqlxspFZjh1Jupg== X-Received: by 2002:a05:6402:6d6:: with SMTP id n22mr9478788edy.128.1612637426105; Sat, 06 Feb 2021 10:50:26 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id cb21sm5890005edb.57.2021.02.06.10.50.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Feb 2021 10:50:25 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v4 1/8] dt-bindings: usb: convert rockchip,dwc3.txt to yaml Date: Sat, 6 Feb 2021 19:50:10 +0100 Message-Id: <20210206185017.1817-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-20210206_135029_201198_9D915ED9 X-CRM114-Status: GOOD ( 16.50 ) 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 --- 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 | 95 ++++++++++++++++++++++ 2 files changed, 95 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..d815aacfc --- /dev/null +++ b/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml @@ -0,0 +1,95 @@ +# 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# + +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 Sat Feb 6 18:50:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12072283 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 92C28C433E0 for ; Sat, 6 Feb 2021 18:50:42 +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 203B764E59 for ; Sat, 6 Feb 2021 18:50:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 203B764E59 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=D6srjzJjtGUebr+4080/V28gKW 1DEHgFfwnMJ26dqdEcDKh4KDjEal66FHZ36+zRP4neHV7luDxb14H6Whhillwu+r+6jmsp92B0bBS uSIznMnt+d44bxZg4ioc9UDqaAI64GY1HiiprfeFkSgrdwJwfGQy+jDVyGWiv3JhuOsk0Zistf249 jDjNV2Peewg4AQyZrAvIrGSELC6Q23YvVCKMSsxZZR8NW9PiBRSVy6Pe1+VPylWdplWrTwA0AU4fJ bzpnynagQZGIsuGoBMPY4XP7w+cw5YibF+zv3IKN6LvMW0+H8meOuZi2BH0Db0w/lM01TF4UyHzAY 1YZm76Zg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8SfB-0003vK-Ge; Sat, 06 Feb 2021 18:50:33 +0000 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8Sf7-0003sm-Lj; Sat, 06 Feb 2021 18:50:30 +0000 Received: by mail-ej1-x630.google.com with SMTP id sa23so18365770ejb.0; Sat, 06 Feb 2021 10:50:27 -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=d7wIQg/kQKPuJEe8XMCa0Omf+k5pPZh+R36O+btiduVd5PhaZ1p+gD2X75swaupmpB BXwilOhOTs4C9n73ONx78+2EN+9wzfmnvep2w3n9OjTtf1PqaBOQaFMgE0Qse5edElwF 1JZMLGTSS9r/mxmz0v+vfEA7L2956FsfV4vN73TOS7SxZ+RVWfFOkWqS7+nb1qQxkkSw du3CmRNW2oAix/YkFgEI/5KYBqfy4arjDwkV0PSHiUmlaUM9dlUBxeZh0I1vIIY0ShRw Ur5xsv3e9yIuLxgSMZfss940PDX8rmnGnQfMGQAhnk9aCAqOlmJv0hqHJhfAFXQGMB58 QK3Q== 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=sMyijr3+1PxXUC6hl6ndxUChiaX0hA0st3l9n+Pk31j1C6wNSvWquEd+iku96Ht0zr uVYUXxav2oKUXl1U/Z1cMkKBLy7fLasM7kwBjL/j4Qysy0MS2FF6uY5bjWG7YVZOasZx zp5zbjQLWQaAXwRLng91941rzFgWfo4pS09eYD4VqrDWMA3Sv8L9hMAIf8jCvLDdtSXw VPjvRfPO0fJ0ND+pOb3fU6Ui+kpQzXkbY817RssbdHxXawmH+fUjJx8G0Eicf/JinQav kI8DPfZWlCIj7UKvggTdBCRQjzvyrr02eeCNGZvK4Roe0ihfiT5+UNwYoCH+jslS+iD/ k5EQ== X-Gm-Message-State: AOAM530tIRPYGCVfT4zCRPML0dvCxQ17gL2rt3LHJjPrv8z5BG3mgY3d bafaE3GdxCa34KdWRtx25GQ= X-Google-Smtp-Source: ABdhPJxcZiMzgDmxsI7jNur/RIOnbyFQ+m01RdhWlPqPCprgIJ3m5eJiGBrYBHlEQKvUC3rLb/24lQ== X-Received: by 2002:a17:907:2897:: with SMTP id em23mr10065424ejc.550.1612637426909; Sat, 06 Feb 2021 10:50:26 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id cb21sm5890005edb.57.2021.02.06.10.50.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Feb 2021 10:50:26 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v4 2/8] usb: dwc3: of-simple: bail probe if no dwc3 child node Date: Sat, 6 Feb 2021 19:50:11 +0100 Message-Id: <20210206185017.1817-2-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210206185017.1817-1-jbx6244@gmail.com> References: <20210206185017.1817-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210206_135029_726522_3CBBA159 X-CRM114-Status: GOOD ( 13.67 ) 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 Sat Feb 6 18:50:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12072285 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 5393DC433DB for ; Sat, 6 Feb 2021 18:50:43 +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 D4FFD64E64 for ; Sat, 6 Feb 2021 18:50:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4FFD64E64 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=DScZF/5uv4UCZBtapU2KaQsKi/ W/pNOq52w+vJk9zroDpd+1SurWqnlEHl2BjkV76Y+wEW4nHG1rvjQcntLy4l9qIhxj7/ZfB8MEh/i C14Fb0HmSVLxTxoa1lpxp/oBaP/I/H5trZ1EJSJbpmmS0BaLr0qii6ObkNwOaSovv/+5pIYnD4HNp hpaZUnjmEE3PaSgWhSySUy8xnRrcSBmPG3rJorjYzDJl7Qju/CLIE4q3G1+Dtq8LUHY4azwmYvEBj DCHSrGBg133+yhEve5aj5mz6b2RtVuVGquTrwoRQWFfmo43JD/W29wPt54JlhugCRIcsulj9eOqg4 jZEVHL3Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8SfF-0003wJ-Ek; Sat, 06 Feb 2021 18:50:37 +0000 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8Sf8-0003sn-Ez; Sat, 06 Feb 2021 18:50:32 +0000 Received: by mail-ej1-x633.google.com with SMTP id i8so18257853ejc.7; Sat, 06 Feb 2021 10:50:28 -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=Pow5OVqmSB0fcoLVh8t/96ZlLlvcjcDIj/cfOUe31XBTpWOwy/8e8f0h8Gy4NE44aB 5IlVy0Q5D6cuNPBIm6p3WFDha4KqoWRemq2MIAkJBbdHVIgX7LSusE9cPz6A6flxfUsi ofMy0MdMc/+ZbMvx1cbJkwbZPPBYNThQD4ELYAYReNp5X/EIEdbH0mwe5SReH/z6RPai MMduoV279WZJQQMzapmB/x186JRqpfs2Ej5k8DfLS1wPonrgfgByocHSXdoVBaxtQX5D MLWnbjAR6LzXe/STQW428Xg9yzWdJgzgoaaVkQu8IWNztY16Ghwj7AezWMvJJD3Y16l9 V/IQ== 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=A92hX4OT1KcGllIDkY0RBm6qs3F9BKVSmO4Fd1kc6wM85R1dVVlhlyJBr8sC06SCm9 bQ62rsOo+m7Oby6LPXqXFdiOkqLGipMzAikN5w4rgIt9N5IortyIoMh1F83E1a/uFEXh IWJNqoU9ocHxKOhAdGvoHatvOXl1/mLiW/twtW/MLGRbHROo4fOeAIV7JOvjayth/ZA2 789l8SXQasPPNQ/dsyNocZjQrvlF+2QvbdspJdCkcx/JixVYp/tOF/K50az7/QibElni WUhFlPmuAF3hLw/Vv+Id1qtlsn79D3s9mr8KKjIra10a7a7n4TizyUCQ/ytDmnJR+dAK uy6w== X-Gm-Message-State: AOAM530qHc1c0HzUKUojDT53sulT4Few72zM0GMPWVusdfMSgCq+PEEC sm/oZ0l19XH9H0owrjeLcjk= X-Google-Smtp-Source: ABdhPJzLu2mmugL+rzB/9sYJ0QJEg/ICCAcVOclFB2ADHKG9bnSL4uodB3zf9KSSrT1Ar53emqgkvw== X-Received: by 2002:a17:906:2bc2:: with SMTP id n2mr9618489ejg.381.1612637427667; Sat, 06 Feb 2021 10:50:27 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id cb21sm5890005edb.57.2021.02.06.10.50.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Feb 2021 10:50:27 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v4 3/8] arm64: dts: rockchip: optimize clks for rk3399 dwc3 Date: Sat, 6 Feb 2021 19:50:12 +0100 Message-Id: <20210206185017.1817-3-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210206185017.1817-1-jbx6244@gmail.com> References: <20210206185017.1817-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210206_135030_544362_F48720B8 X-CRM114-Status: GOOD ( 11.81 ) 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 Sat Feb 6 18:50:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12072291 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 09346C433E0 for ; Sat, 6 Feb 2021 18:50: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 65A0B64E65 for ; Sat, 6 Feb 2021 18:50:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65A0B64E65 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=napMl2kgyV5qV2f+tLbHF5oQU2 VFL371VXl9tWHxHtH2J87Bqmv6qWyd5wBPn7Hv4xUeGPbZCHBGi4nGt2waX+DzTUkDOWT6wscqHip XnTzi4QIte8SRwAe29jP4brtqN6CcYEjLBIXtz8jJqxFhf3O8HgMj8/AoC8HPKi9ee270UOA6dsk6 EEfOguQTCUNlNnZnXWtolCXhu4F9fMHTu7KTSL1ycAVr/sgS5hAnKrJJus5VOTn79EzorwFel4pBE n39zxoCevfHS0uO61SpjOxw6ebVBRJ8VaxLkwFSeTIwodDK4AZPVMRmTJraBMc0Vo9kq4JEYfFnzn lwA2KtrA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8SfG-0003wR-1S; Sat, 06 Feb 2021 18:50:38 +0000 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8Sf7-0003sq-RY; Sat, 06 Feb 2021 18:50:32 +0000 Received: by mail-ed1-x532.google.com with SMTP id l12so13426756edt.3; Sat, 06 Feb 2021 10:50:29 -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=f3ZdU5i4wuexTsDlFp00dY/jYVo4pR0N/01uDY9zHxUgcEFUL5tnFMLeO3lE8fLfqQ K2Lr7e5e7t32J+khg6noSmcYF2qqEHCNpimBxaQny+9af9D3H1UYxoe9IaDeoPWL4twI wBIXiEdTtztBx+l5RLs/AYFVtgbihTgIXex39aoVHXdZzD8YS+TeTaHLfS/ccb51xfgk 7lzqpyesfudlLPTxToRHvtYray1d6Abu0XmxekLlCaJn54BSzSGH7vneI9IRA0Da1FjG jUdvLpEUlVypiZGQ9N1b2eueCWjBMZV0Smj1oHyzic4JiIydZVy6v34pttJzUEFvQcUs 8GoA== 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=Pp4bWsSOFCyvpuM0jxXO09OsUvu7245L9v1+Isb7AlEuJkSvQmlrAHNDJ9fJfZ8Frg /24PuRK273hFfOB/Fge/41H/k/pyxQEr3V2eUAviEBxBufbCikbJktG2PyB+qu0DrKkR dpxdiTJXjO6CJyiyE8VjGkiP6CZne7P1jYByX2OlQouTgUmunNca+ZGfBKRJTEUDCEf8 U6BBRTsTH06cWD4fU2RYOxOyBxE/RsW+hROE+kW9NTRX2ih58pKtk1vfI2lKUuBIvT4Z e7qxwnM8cqA2Ae5aAQCQi5bp0ROc9IEEQBBAE3EBalNUb9WharRGrNWYV0ioG7K1UFcA wTTQ== X-Gm-Message-State: AOAM533xlj5olEeTb/vpADMJn+JtOCFT0/RatgZTpEwKODPVH0BuzVEo ZueSAdpM4iwHl/mtIvHrddk= X-Google-Smtp-Source: ABdhPJwTi9djR8YRKcprC0YJbhUiG1wKm8pfgxWz/WbL3aDBgRvO3qcdH/HS+pQfPqbYlC2fMvEiKw== X-Received: by 2002:a05:6402:7ce:: with SMTP id u14mr5111912edy.370.1612637428612; Sat, 06 Feb 2021 10:50:28 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id cb21sm5890005edb.57.2021.02.06.10.50.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Feb 2021 10:50:28 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v4 4/8] arm64: dts: rockchip: restyle rk3399 usbdrd3_0 node Date: Sat, 6 Feb 2021 19:50:13 +0100 Message-Id: <20210206185017.1817-4-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210206185017.1817-1-jbx6244@gmail.com> References: <20210206185017.1817-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210206_135029_914356_E8057F78 X-CRM114-Status: GOOD ( 12.46 ) 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 Sat Feb 6 18:50:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12072287 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 80692C433E9 for ; Sat, 6 Feb 2021 18:50:44 +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 0152664E64 for ; Sat, 6 Feb 2021 18:50:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0152664E64 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=JY+MS+rdC0nHjjRV5tfMd4vp9x hgLgik8ujNI674Wv7yQOmoOEVXkADsBMstBJdGLrR6M/vTKf131op+95fphic2HG3c3ZqvZJEM9Xf HSovDaQvPSSAH7dBB3M6apEvdcBHX5SppZfIIFs73EleHNzm0ft7XMpdDPq7Ul0hZ/0Ytf+LUWyX5 CU49D/W+J+3Odq3SHJi468NLmA+agdMX5Y5hJ2M9cByNB2OdelERghwrAs3pQFQJSCnWhhRMNIjvE sSPKi07kM+Ec01hQmQjZ3t1YqxGRZOqkzvGBhXSgsnrOAXeFJpnoS709FrO4DzN6LLXYXWTdj+xuM enpnTuSA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8SfI-0003wu-MX; Sat, 06 Feb 2021 18:50:40 +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 1l8Sf8-0003tI-N7; Sat, 06 Feb 2021 18:50:32 +0000 Received: by mail-ed1-x529.google.com with SMTP id s3so13385258edi.7; Sat, 06 Feb 2021 10:50:30 -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=XscFFkaPP17NOR2aXPG+1XhQcV7dT+KK8PakYEuaOxy+M4d9vYapN6ZjWeL85M0Cfs LZv3KriXrhuQ9y0/vqrteM3u/OYKLQI8xzDPw/8pyRp7BMxgSWwT76r6nmLBt+yM5LBl GiIztQqDHvAj8RuStQw8BfsGGrBteMkmb7LNVy/5vCDgq7ekVvrFO/sL9ENaedKebebU mOQ3TvM0013gX3XPY7tlNOfaFSC33zN94wag05IqlbXFqPy5DyKUUPOQ1se9q45qiypS g3RVIz+4NMjgEjLfktJDOBxMULhvwUj6gthi3X2b3F7Xz71ZchlGa/O9nAYZKhxJ2Ioq ZbDg== 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=pg+S6+06YR2MSqR/EW0sZGxp/Y+0oS/4YQAL9AQuegJhI6+52mfa8Lv+WaRaSSxKwc vwYHmAFdXk1o8w+jBaiOaM5OQJ96vWZaiHaKYJXhTHCDdTOjJ3f08U4d/qG/o3181IVG bW0C0ztidRqGsry0i/SHSNkDcfMMtQnT6Y6YAmpjYpMMqxwR1blk2HZNvvt5jUKhXcqc EGucApG4vZ0rwJfFnNxqvNcew4np0YVzJ3Bo3knKNhY6UU83kiB4m8QJv+RI5z1dbRgs Rt+DwCVvG3OvLimVajO53/3yocBu8DKmWWZ38Y+OJrTmTedU5M4QIYUYGn4eI0yM70p7 Mhvg== X-Gm-Message-State: AOAM530U1wFOdKl8AaaQ+MOPyZbb+wDUMYiAiGzJg0gUko+0DqEdscfs jr4Dsg9ohLBQ9XLOnHB5hQ8= X-Google-Smtp-Source: ABdhPJykWlJwUMhyqYboMYzCx3N2HWKgCtLRzSNU3WC1+436yjDaGUGu7xRhAq7f0ij1WS6DF8BO6g== X-Received: by 2002:a05:6402:110b:: with SMTP id u11mr9700610edv.57.1612637429561; Sat, 06 Feb 2021 10:50:29 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id cb21sm5890005edb.57.2021.02.06.10.50.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Feb 2021 10:50:29 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v4 5/8] arm64: dts: rockchip: restyle rk3399 usbdrd3_1 node Date: Sat, 6 Feb 2021 19:50:14 +0100 Message-Id: <20210206185017.1817-5-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210206185017.1817-1-jbx6244@gmail.com> References: <20210206185017.1817-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210206_135030_974571_6ACC73BF X-CRM114-Status: GOOD ( 12.31 ) 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 Sat Feb 6 18:50:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12072289 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 228A8C433E6 for ; Sat, 6 Feb 2021 18:50:46 +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 992F464E59 for ; Sat, 6 Feb 2021 18:50:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 992F464E59 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=045+AA8JKXAlQ1hhI/+uako/bPSwthj6K7XyFoH3BHs=; b=pN76wQORRdkWzC/BwQ/SXTVCj/ pefuyQjtcI9ca3c/0/d/wnw1mULoN9Sn++e045LUquFyH6KhUrOZLskmk3F4wyjc6UCZUvlVR+PIR 0QWnkdkMdQJXf3uNGie7+1jwcwqbi7/CJrxNqNkIB9S1ICDgrIz3Dm7ia4l41tFKiQ589/axh6C22 C/fPIrPnRG6nLAoLwLoloolbFKJflhT+4Wfaxw8Tz7MrZpI8+ZjHt+iBEjYPi01cQFKnab3FUDKqc HQcKCEXp/rA8M1PP+lyxxRYk2Gx9aRjGLKC0LR1E55jS9yF1SsuAPpsT+Dxf+xW+INkAKD/DFBMPy ZHGXYjKA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8SfK-0003xc-MO; Sat, 06 Feb 2021 18:50:42 +0000 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8Sf9-0003tg-Dl; Sat, 06 Feb 2021 18:50:33 +0000 Received: by mail-ej1-x632.google.com with SMTP id hs11so18354228ejc.1; Sat, 06 Feb 2021 10:50:31 -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=cNFFFBXY6L5UHLHUyj3rIyUKC+rbFyqqqVFEOT4uqFw=; b=CnzYUuxcOyyTvOan0vBJMMJPGwICmf0/GH9SAr4roDkk2w0jcRAOb5QFrIJBnRnage svbh6I70pNYLmUByFDqW/N5b0bMUUDdb+WDWr1yFXDjh4afUM8Ai54CVVs6P4pbJ0diK E3DTUWXcSYOueZQsG9UeXkeSUbcHFO0+gdHboOrjk4CJX9+b8vO6Tb7qNw4tD1qQ014S d2q5bQZjgKt9g1xo5rJXf2UlAXLKwDCgdRZoEdJW8YfumtLc11QfgQ3hCAQFhbOjyvpz jzZ04XCPPK8L2CyxZstvGnFmY07niZ3i5uSx36r/0Cz5/0nIMRDKwTLl/z9Ir5eFF1u+ h58A== 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=cNFFFBXY6L5UHLHUyj3rIyUKC+rbFyqqqVFEOT4uqFw=; b=Z8ess3xyQ58gbB2mjaCfjSZF39dMMRcgEPDfFEtXxE6a3o1XC4ps3HwVhWL/LdleYg 2Dy8L8mrAOrbRd2lu0NQZJE/lp+96mgoBJ8hGWmL4YNDUGeEUFwU6ejPMWgNPcgiw7QO yJQaPSP02pwue8bXN2SYwymU4xQjcwphNV8KJ3KtuA1vO617k9R5T+E4gHeJkRu6rZzd 1p/DAix3ns8TdHWNhBkKmR+fyo97gRgy2FTIiIOKGa3BYa2gDSfbOdjS5KNOzJzwkRjk dHRfLFUAhF2LWzc3qbweYpuIrI9hI2l+wHgDRrMineUPoLXSh6V1MDsdMA9qCXYeg/PO nrdA== X-Gm-Message-State: AOAM530+DsWf3cxWU1PM0WxG2t+M1DFDqM1kIS3J4yUnm02BizWqtobk GOkLox6Ltl4P1PIxQp5ivh3Xhu8D2co= X-Google-Smtp-Source: ABdhPJylNtHRx2BQ92Cv5mX8YLcNOgMKwC7xgE/+m1i1Q2fl7RY+GSv0b11XH4gATIbkcNHYHhif/Q== X-Received: by 2002:a17:906:d19b:: with SMTP id c27mr10099272ejz.234.1612637430296; Sat, 06 Feb 2021 10:50:30 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id cb21sm5890005edb.57.2021.02.06.10.50.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Feb 2021 10:50:29 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v4 6/8] dt-bindings: usb: dwc3: add description for rk3328 Date: Sat, 6 Feb 2021 19:50:15 +0100 Message-Id: <20210206185017.1817-6-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210206185017.1817-1-jbx6244@gmail.com> References: <20210206185017.1817-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210206_135031_500301_8CCBC99A X-CRM114-Status: GOOD ( 11.31 ) 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 --- Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml b/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml index d815aacfc..08a08ffce 100644 --- a/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml +++ b/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml @@ -27,6 +27,7 @@ properties: compatible: items: - enum: + - rockchip,rk3328-dwc3 - rockchip,rk3399-dwc3 - const: snps,dwc3 @@ -37,6 +38,7 @@ properties: maxItems: 1 clocks: + minItems: 3 items: - description: Controller reference clock, must to be 24 MHz @@ -49,6 +51,7 @@ properties: Controller grf clock clock-names: + minItems: 3 items: - const: ref_clk - const: suspend_clk From patchwork Sat Feb 6 18:50:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12072295 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 61F5DC433DB for ; Sat, 6 Feb 2021 18:50:57 +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 0163F64E64 for ; Sat, 6 Feb 2021 18:50:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0163F64E64 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=ESBpH47E83Aqd864RwJaxnTi1x fAgR5DeKsiYveTO0F9qG3pFrM2r2FgFXA2KuBE9+/O8HOPaul1Q+Sni8+7k1EzLLsbiJWaPkhE/rr 7+vdgpGtfzp4s24PCWA0SjaUjSYLGE7Y3KmT5N1ZSYJhjSvDLSIqUeM4uDuTIztLaIzFkzLfgmAKr 69dBfyjMgD4c3yicZfM/0ZFPlwLLv8xlCFo7e21pQzN54DGSBJj5IRirIhPFuAZnnikSh0SQ5rNnd xzIrIeyFDCSz8PoMND81STzwq5P98/jSRiZnfAHB+rEYi8VmDvrsAZF6xV2B9HhMEy1/TvDaq66wN hNKfaAYg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8SfV-00041V-Fk; Sat, 06 Feb 2021 18:50:53 +0000 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8SfA-0003uA-8h; Sat, 06 Feb 2021 18:50:35 +0000 Received: by mail-ej1-x629.google.com with SMTP id sa23so18365931ejb.0; Sat, 06 Feb 2021 10:50:31 -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=R6fCBkx8u/8W0j4Rtc2sDV5mm7466GqtBmaU3vj2oPj7rN7vsiuOzmxLNyOAcg79Gv hi5iZPp1jAJaVzKa1JveNGfh4eQAzOYUP1MIvahayzsK5HS9uXw2nu7cOFzVYVoC+6fZ JUSTdRiyMz8UJgsUkHRhznQgWl9UmSYAsf6XBZBQ20prRIx9SRbSqgcKNsQNTRbNdVrN Za/xPHXOLOyfI1T8aqoD+PWjUzp6e7MJg8xky6fsIx1+eEwiND7PrxkT6bnlCV9SVIO9 Cp+iGMm/MydppiVAH29H62ZB+FViUMtoZDYNYPyZNlyzm8IQQilWgxpjoVUkaGXUpoJ2 6QXQ== 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=f+w5HIFcMifNtX88l9k2bZGzy8be8XpHI/U0lzeJnzdK82sGPHV+I3uepPT0Th0jPx HGTLY2P3/x5ErnF0wWkUO0OkRIjUa5WHEekFT9aIXfLe4kIy3FIJ+LhBkIqmo6zdNSwD +DxeMyuAfvnHwmBXKjWoWNiHivEg/qAgjNgwerr/KmOKJNUnB+JAyGx+KCZtpH3C2PLc DJ1pbC8NzqMrMNLesqLU8apOnYwc9DFdJ034Jbow1YhyCbRs+rWia1x3SAItPxVOgpyy ubSoRcFHjHXChYsHM6R7nZVXLbRaGk0uPHRMu53OA8hhlSP1qblpBQdZVKbHfj+Aeuvo GhyA== X-Gm-Message-State: AOAM532qU7INh9TrESX8YwN0go10pWd9sZ79vi60t7KPJ4JvpWfVp+3B ZVIYrLXYzbtj/GGBhd3JPNk= X-Google-Smtp-Source: ABdhPJwsSh1tKVCA79/3hisG5qg/We4ZfU7mddmJzSHUz1nyYR4t8uOAg3xqYl8Fbc8VHsMOR1t+zw== X-Received: by 2002:a17:906:854d:: with SMTP id h13mr9521280ejy.124.1612637431042; Sat, 06 Feb 2021 10:50:31 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id cb21sm5890005edb.57.2021.02.06.10.50.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Feb 2021 10:50:30 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v4 7/8] arm64: dts: rockchip: add rk3328 dwc3 usb controller node Date: Sat, 6 Feb 2021 19:50:16 +0100 Message-Id: <20210206185017.1817-7-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210206185017.1817-1-jbx6244@gmail.com> References: <20210206185017.1817-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210206_135032_340406_82AB9F50 X-CRM114-Status: GOOD ( 11.47 ) 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 Sat Feb 6 18:50:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12072297 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 257B7C433E0 for ; Sat, 6 Feb 2021 18:50: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 B3CD664E59 for ; Sat, 6 Feb 2021 18:50:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B3CD664E59 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=l1UlZ0XSUJxKrSiIdNawvcoAN4 7r+Ik0km/5U6ouSfSGLR+t9LfklmnU833jvQ7UPDauaezKbd8CTeixkxzYCbbXJ1Zo74TyRDvFJQb g1fg1XafefewbkkynEvTskVo7HSt5jAdN80KHGe0mTvpWzr7vkGud4o+TolwwOujJbqSfYb9/+qP6 OjZ4rkFy9cYVdHdzIKi4Wbl7XF/Nj27PAaQgWK0aoxS56T70USgLr9QmO8zNrSkF7H5FK/E2NhHTN GcXlQ8II01LHFtRw4TqLN1q4Qgy29Ej1/WTBgJR+WzILuNeNX1cv9tv9NFd/9kRQ/Z5MOTkyUyqEg ZDF64Rjg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8SfU-00040x-Gi; Sat, 06 Feb 2021 18:50:52 +0000 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8SfB-0003uY-0B; Sat, 06 Feb 2021 18:50:34 +0000 Received: by mail-ej1-x635.google.com with SMTP id hs11so18354283ejc.1; Sat, 06 Feb 2021 10:50:32 -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=dxnRtsYmoNO08QDTm2EZFmG/T23JMcH5IQolk9/b0IoNtT5EFbyKFtRfgdirtktHdg QS0Kyg6BQoCR6hrtkpphM9v0vA9+KnndfyAs12PitPwIvQl76NNbUMmrti5m84D+KU0+ JdYmTqINPLzMqd9tzWVusZHAk3WzHRHVhKksOH5KqJUm6UZv0gzMpng0VWVk7PNEpgr4 CHKaU208IpfJjWT+0Yyq0tn6Wucg8O2BLeWn+f49bLU+JDzVkxpMP2xrBQswIQh3OSie VDeEtgHLrIn5nBQsJ+/5eMhJcDVv8hAaRTl4bOrmds9yACjz8CQavz3sX8bAwmbfDQzm ytFQ== 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=Kq54PTedb1YNDCMmUH6B2kSr8F8XmP/EBevv/9PpWpUQ5l7pFs/5Vqd/Co0HYgF6ib gteSOwLzz+khWhDrl34gp7HwgItiGmxccARge4AXyLweSpTWDKysEivGbMHkjdrV/K80 QnW8UF4Xkori3onXL2W7oTFNEcPgjHoLQWbYNK9bKJKTvJkEL1jwv2q4yTnyTLG6h/hw cfDLe60pWS/mWbMAYas1e9rtxeT/1xJtINLwEH4CP4E/u+9NT9QEiVDpcEOFjP86iOvg 675aP031emSPVGTvBgrsCShFvftwnCQ0ry9qJbx0WLHWyxmBGCr21ks0bPWL2PeUgPin jKOQ== X-Gm-Message-State: AOAM5304+0tAI5HiBI/R2Epl6Zz+EVsphuffy21il2TPWROzTOMQ6MLo Ak2Oop/Xd7RF6XQvRnhn4S4= X-Google-Smtp-Source: ABdhPJzeqxbxxXcW77TaBb3tEnIZmr97HAxQZzXcFqol723r3W9n0T3CYbLDmWAah/M+tRsSHEZ5Ig== X-Received: by 2002:a17:906:f102:: with SMTP id gv2mr9769363ejb.47.1612637431762; Sat, 06 Feb 2021 10:50:31 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id cb21sm5890005edb.57.2021.02.06.10.50.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Feb 2021 10:50:31 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v4 8/8] dts64: rockchip: enable dwc3 usb for A95X Z2 Date: Sat, 6 Feb 2021 19:50:17 +0100 Message-Id: <20210206185017.1817-8-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210206185017.1817-1-jbx6244@gmail.com> References: <20210206185017.1817-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210206_135033_100059_AE9ABF1C X-CRM114-Status: GOOD ( 10.88 ) 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"; };