From patchwork Wed Feb 3 16:52:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12064781 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 02057C4332B for ; Wed, 3 Feb 2021 16:53:11 +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 5541364E35 for ; Wed, 3 Feb 2021 16:53:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5541364E35 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=R48qMvioxCtABmbK3pOBteFcnOTCcAZMsCGcOFVoGPE=; b=Qk0oi7n5xsDviImUg03tfb0hoV E6xcI1pvIi/KGNqfNtMWr6M1tXANjEtFX6kARMD/peTTdjA7g7iJmBak5D6OsUiLeLyMDvOssvKxA U3gQJIlVDUxEy5BbZI+rbTNXcXkUfqNQM6k7Y3cFhzH4TOR9wGXHROXTM5WRVINHCoVznbev9VeVL mdgk7MIJ7+FER0WftyW6/8juRmhoddYIFRHpWqURqJRw4fO71tAtzifjfRb3riEffK+y2DqFKN7ZH sv5ePoYDoHHwZ5jPooQzOXOGrCIiEn567XlgNfK4ig1EMlP/9iT8wM5s/gWk/einW129tPPEo7OyV Qegy8/+w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7LOq-00041t-LK; Wed, 03 Feb 2021 16:53:04 +0000 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7LOX-0003tP-Qo; Wed, 03 Feb 2021 16:52:49 +0000 Received: by mail-ej1-x62a.google.com with SMTP id f14so94983ejc.8; Wed, 03 Feb 2021 08:52:45 -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=JEnnwLcGF9q0mKcU8PSsDi0DOzulD4VTN4umh3Ha6H0=; b=hMjux1sF5PWPjqiK46a8OvJrnZ+Bkp+oppdNTlsK3sRvKqdEUs8HywxAz77DA5+toq 4ZF9JOUwT9xvXjUqCT54eXJ1aqqUlAIBurtBYhhq89P8MFoNx4/yjRDHAGA+twP+VpQM eumhPUjjif5ae88+dHEpIjqKtsf4KTFYzU0/23UGFA+GDbmJmoPQJa+KBndYlxhk6eIn tMSiqUBbBALugNVNjv5aCKId1aebi+b528D3Ov/3xyl0+6/dQ/k1elrK/EITX7DMX07w Fb33cGPTeiGBCXrtI/W6qIzKmqVc70vWBdtvY+n4eXh+jFip/Ut9kIcfRDPd6Z6sWOKj i81g== 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=JEnnwLcGF9q0mKcU8PSsDi0DOzulD4VTN4umh3Ha6H0=; b=EylSEqW9wvA4Qbi8fQ90rdoNwiwWJA3rXNJnncs+dfD5m+/QRqphYkEkW+XLd9dhSi +e16QZVxwoS48NFAAYtOsb8rCv3R1gyPmuSPA3UpoE9h7/twYfSMcn4Igmvo3J//LkmE 3zoYynXVTpeFx5mTVDecvy4cfLuTimhLo8xRILVASsZMAn37FDsnezBrzbR57qUw9Yjq ApdhRQBrJLNR8frdGENpUAd3OmX1OnevKfl6cN0EdQ9V6Ba91tsvAjkn43yTEpcgcOt0 cig0OqLzXzcTaEv7t6rL2DBizPwvh/lfWLENykexqLe5Qc7Cau+Mlo5xqBcgqN4fi4yl pSNw== X-Gm-Message-State: AOAM532EPYd2S/Eg6BSUSGIe9ySE89erLHpyVBed8O84t8uItmh+pZxu Jbd+e/qbDDIb39mRyx8joaI= X-Google-Smtp-Source: ABdhPJxebgZx4b2w32NKPo24eGuxnQ2VZZtAmg5kR7l2wa6AqeZVUDH6rXKX4m2gXYRQ6C3yXpJOig== X-Received: by 2002:a17:906:3401:: with SMTP id c1mr4209371ejb.156.1612371164163; Wed, 03 Feb 2021 08:52:44 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id a25sm1135471eds.48.2021.02.03.08.52.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Feb 2021 08:52:43 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v2 3/7] arm64: dts: rockchip: restyle rk3399 usbdrd3_1 node Date: Wed, 3 Feb 2021 17:52:29 +0100 Message-Id: <20210203165233.22177-3-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210203165233.22177-1-jbx6244@gmail.com> References: <20210203165233.22177-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210203_115245_914483_64672659 X-CRM114-Status: GOOD ( 12.90 ) 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 --- 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 5045e002a..cde221c88 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -419,39 +419,28 @@ }; 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_RKSOC_AXI_PERF>, <&cru ACLK_USB3>, <&cru ACLK_USB3_GRF>; clock-names = "ref_clk", "suspend_clk", "bus_clk", "aclk_usb3_rksoc_axi_perf", "aclk_usb3", "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 {