From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55D4CC433EF for ; Mon, 28 Feb 2022 09:10:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234237AbiB1JLH (ORCPT ); Mon, 28 Feb 2022 04:11:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234088AbiB1JLG (ORCPT ); Mon, 28 Feb 2022 04:11:06 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2D4F541BA; Mon, 28 Feb 2022 01:10:27 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id vz16so23461287ejb.0; Mon, 28 Feb 2022 01:10:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=8Krg0mr2kaK68jYx48nJZ0wrk+YDfvLz7ns689XPH4Q=; b=d2iKmv82fP+XIWJs+Hur4KZbGS6cxWprmCmJYJeK9o7EvzXAx+PxEQCqO41184GskG fc5MZFAuqGyoNY0CF9xKgItODKT98AWTVnaKB0VNav06lTjsotGQc38ZCZRIfJo0Uqb1 OzCnd1kaHdnYJK+7IlWycPbUBrMhSF1VVVf5Ch7qoRBU+N4ldD1O28HuCYS9bdoOoVdY 68YUVoE9XLcHpVLvf6BJPetNFxIMFIycwvB6RLjdTr82zlaVtvcINgWcU/NOtBZFlWmA SM3jG/SEINe1CyeYf61Xp03bbaFbNC1oWI0cpMX9nLXwA0QOLymkFWpfp9rNvW1fZ4EZ VzwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=8Krg0mr2kaK68jYx48nJZ0wrk+YDfvLz7ns689XPH4Q=; b=4MPuZAEa5JKe2TAFWTNsdcsdkk+zQIq9y3VF1o8nUWSnRykvt6i+ttE46wliz3wuU5 R7j5MxjjN8uOn17VvPYbn0Z03RDKV6+uoxEjVLcy3wMGuuic8wTlVpAZqp0tSD056K4S HNnrdvWTwlZ8NE+p04cFy8aND2m4He5X5+6QJxcPQdE0WOZwQWe1MOr/C7nQX7FRAsN2 PDC/vPV9ij+hQuaTIELthxSHWLC9A8c0EyF3qNQ6SXU9s/sai4CLLxXTmfl73AhjENNB 9kZNnO8JgwHKGg5DoSvBZ0xbWOwqCDR74wbSj6YpnEJlGDUIcysRQ8lZ9TS56JpbN6H1 IW3Q== X-Gm-Message-State: AOAM531JC+3y135p5BCE1ZnnCaeZJpmZXxao4r9qvHl9MErIdBKSbya5 sdayt6FOe35+GqiZH8iPJso= X-Google-Smtp-Source: ABdhPJy0evTBl6CYcrzsaeweTsqhlhACAh/N0Lw3tRWxs0lA48zDANMnfJBJjpu1sG0Oha5+dM1R6A== X-Received: by 2002:a17:906:a0ce:b0:6d1:cb30:3b3b with SMTP id bh14-20020a170906a0ce00b006d1cb303b3bmr14669120ejb.582.1646039426333; Mon, 28 Feb 2022 01:10:26 -0800 (PST) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id d11-20020a170906c20b00b006d584a09b9fsm4191677ejz.98.2022.02.28.01.10.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 28 Feb 2022 01:10:25 -0800 (PST) Message-ID: <3ac3cdf9-17c0-654f-b204-c5b4b0436c98@gmail.com> Date: Mon, 28 Feb 2022 10:10:24 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH v3 5/7] arm64: dts: rockchip: add rk356x dwc3 usb3 nodes Content-Language: en-US To: Peter Geis Cc: Rob Herring , Krzysztof Kozlowski , Heiko Stuebner , "open list:ARM/Rockchip SoC..." , Michael Riesch , devicetree , arm-mail-list , Linux Kernel Mailing List References: <20220227153016.950473-1-pgwipeout@gmail.com> <20220227153016.950473-6-pgwipeout@gmail.com> <7b20fccd-4394-da3c-6556-4732d67cde3d@gmail.com> From: Johan Jonker In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 2/27/22 23:44, Peter Geis wrote: > On Sun, Feb 27, 2022 at 12:50 PM Johan Jonker wrote: >> >> >> >> On 2/27/22 16:30, Peter Geis wrote: >>> Add the dwc3 device nodes to the rk356x device trees. >>> The rk3566 has one usb2 capable dwc3 otg controller and one usb3 capable >>> dwc3 host controller. >>> The rk3568 has one usb3 capable dwc3 otg controller and one usb3 capable >>> dwc3 host controller. >>> >>> Signed-off-by: Peter Geis >>> --- >>> arch/arm64/boot/dts/rockchip/rk3566.dtsi | 11 ++++++++ >>> arch/arm64/boot/dts/rockchip/rk3568.dtsi | 9 ++++++ >>> arch/arm64/boot/dts/rockchip/rk356x.dtsi | 35 +++++++++++++++++++++++- >>> 3 files changed, 54 insertions(+), 1 deletion(-) >>> >>> diff --git a/arch/arm64/boot/dts/rockchip/rk3566.dtsi b/arch/arm64/boot/dts/rockchip/rk3566.dtsi >>> index 3839eef5e4f7..0b957068ff89 100644 >>> --- a/arch/arm64/boot/dts/rockchip/rk3566.dtsi >>> +++ b/arch/arm64/boot/dts/rockchip/rk3566.dtsi >>> @@ -6,6 +6,10 @@ / { >>> compatible = "rockchip,rk3566"; >>> }; >>> >>> +&pipegrf { >>> + compatible = "rockchip,rk3566-pipe-grf", "syscon"; >>> +}; >>> + >>> &power { >>> power-domain@RK3568_PD_PIPE { >>> reg = ; >>> @@ -18,3 +22,10 @@ power-domain@RK3568_PD_PIPE { >>> #power-domain-cells = <0>; >>> }; >>> }; >>> + >>> +&usb_host0_xhci { >>> + phys = <&usb2phy0_otg>; >>> + phy-names = "usb2-phy"; >>> + extcon = <&usb2phy0>; >>> + maximum-speed = "high-speed"; >>> +}; >>> diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi >>> index 5b0f528d6818..8ba9334f9753 100644 >>> --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi >>> +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi >>> @@ -99,6 +99,10 @@ opp-1992000000 { >>> }; >>> }; >>> >>> +&pipegrf { >>> + compatible = "rockchip,rk3568-pipe-grf", "syscon"; >>> +}; >>> + >>> &power { >>> power-domain@RK3568_PD_PIPE { >>> reg = ; >>> @@ -114,3 +118,8 @@ power-domain@RK3568_PD_PIPE { >>> #power-domain-cells = <0>; >>> }; >>> }; >>> + >>> +&usb_host0_xhci { >>> + phys = <&usb2phy0_otg>, <&combphy0 PHY_TYPE_USB3>; >>> + phy-names = "usb2-phy", "usb3-phy"; >>> +}; >>> diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi >>> index 7cdef800cb3c..072bb9080cd6 100644 >>> --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi >>> +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi >>> @@ -230,6 +230,40 @@ scmi_shmem: sram@0 { >>> }; >>> }; >>> >>> + usb_host0_xhci: usb@fcc00000 { >> >>> + compatible = "snps,dwc3"; >> >> compatible = "rockchip,rk3568-dwc3", "snps,dwc3"; >> >> compatible strings must be SoC orientated. >> Add binding like you did before. > > Okay, should this go in the core yaml, since it's not really handled > by of-simple? Nothing to change in core.c, because the fall back string does the trick, so we don't have to change the driver for every new SoC. Change the node compatible here and add the binding. That's it. The rest comes later if needed. > Also, should I add in the compatible for rk3328 as well? No, same story the fall back string does the trick in core.c > >> >>> + reg = <0x0 0xfcc00000 0x0 0x400000>; >>> + interrupts = ; >>> + clocks = <&cru CLK_USB3OTG0_REF>, <&cru CLK_USB3OTG0_SUSPEND>, >>> + <&cru ACLK_USB3OTG0>; >>> + clock-names = "ref_clk", "suspend_clk", >>> + "bus_clk"; >>> + dr_mode = "host"; >>> + phy_type = "utmi_wide"; >>> + power-domains = <&power RK3568_PD_PIPE>; >>> + resets = <&cru SRST_USB3OTG0>; >>> + snps,dis_u2_susphy_quirk; >>> + status = "disabled"; >>> + }; >>> + >>> + usb_host1_xhci: usb@fd000000 { >> >>> + compatible = "snps,dwc3"; >> >> compatible = "rockchip,rk3568-dwc3", "snps,dwc3"; >> >>> + reg = <0x0 0xfd000000 0x0 0x400000>; >>> + interrupts = ; >>> + clocks = <&cru CLK_USB3OTG1_REF>, <&cru CLK_USB3OTG1_SUSPEND>, >>> + <&cru ACLK_USB3OTG1>; >>> + clock-names = "ref_clk", "suspend_clk", >>> + "bus_clk"; >>> + dr_mode = "host"; >>> + phys = <&usb2phy0_host>, <&combphy1 PHY_TYPE_USB3>; >>> + phy-names = "usb2-phy", "usb3-phy"; >>> + phy_type = "utmi_wide"; >>> + power-domains = <&power RK3568_PD_PIPE>; >>> + resets = <&cru SRST_USB3OTG1>; >>> + snps,dis_u2_susphy_quirk; >>> + status = "disabled"; >>> + }; >>> + >>> gic: interrupt-controller@fd400000 { >>> compatible = "arm,gic-v3"; >>> reg = <0x0 0xfd400000 0 0x10000>, /* GICD */ >>> @@ -297,7 +331,6 @@ pmu_io_domains: io-domains { >>> }; >>> >>> pipegrf: syscon@fdc50000 { >>> - compatible = "rockchip,rk3568-pipe-grf", "syscon"; >>> reg = <0x0 0xfdc50000 0x0 0x1000>; >>> }; >>>