From patchwork Fri Jun 25 22:03:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 12345961 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 2D1B7C2B9F4 for ; Fri, 25 Jun 2021 22:03:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 15E726194C for ; Fri, 25 Jun 2021 22:03:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229978AbhFYWFz (ORCPT ); Fri, 25 Jun 2021 18:05:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230003AbhFYWFy (ORCPT ); Fri, 25 Jun 2021 18:05:54 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E398C061767 for ; Fri, 25 Jun 2021 15:03:29 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id a127so8504975pfa.10 for ; Fri, 25 Jun 2021 15:03:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=prINlRYKbu6XDrHyKyHoo1qSGCIglO6qKAztYX5cZo8=; b=xWYLw2khe8It1X9JVjVczrT6j1lvc6UnQfSriGM7pNd7BLvSkliyqGOCZWqN9KMcyp mRcmMhFK0NMZhQzJE60KmRV8NL5d0S3E4an+hK6VaGHSoRkfOBR7ICP+FDOKs3N16KWu aJ/J2Bk2jDgV+Gdpo3PkSP+rhmXgl/vb5VuhpeqVf4G7qZ3C3/8Ku6d+epb7Z3mQvb4t IrjUR4DIPQdC+4bTAYpMWsZvOeRBGpFwfZS9fcnQhsYwmwf8e8MOYjfteSpmy3x9QI10 UVhQXRhnUapJO5Rby7U7nwT/Tw+k7cC39gydGp/QonQ4R/Cg4SW7b2HVaHY34QZoWN9d JpmQ== 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:mime-version:content-transfer-encoding; bh=prINlRYKbu6XDrHyKyHoo1qSGCIglO6qKAztYX5cZo8=; b=MK3ksw7aPTJhWKqOHqwrc7Cbr29CbFJ2aIX8yTBHjwBvzKyXnQzS4Juek8wz9xOo1P 0uweFi0FykGBZ4nYLNF3lGBjw3PvP+MVItBuHZnViAW5TbXHikfX3yyYsOMqXW3JXPFB vTx9FPwsJxImWmJE/00B73uCcADQ5768Oo/2obeAv6WNxPYPandVN45khWc/KJGwAUqc CrOn+4IzihYJlRQ+tTbLtFJIZ67tcJGlCQitneOnXnv3k1BRhhd0eK96z5EinQanE+KO T3F4iPBFGCn1eehCs7q6bSBAE97jB5TviWniQMf55yUPLVi4ZMGt+3qofQY5RMjvD37w 1iKg== X-Gm-Message-State: AOAM532esPCbmKnyTtMjapEw/2NG8icniIqddHpmUtSXpIYliNxT1CVj 9bm1Kn60crLn5rQJ7+vokiGmBCAJ+adRrA== X-Google-Smtp-Source: ABdhPJxZO3k/nQXbhjX97GIBb6th8H2ZXhtM0Fh3aHIl12oh/+QEX7VYYDn6W+xd0rrqmBdKZwLDbg== X-Received: by 2002:a63:5809:: with SMTP id m9mr7251692pgb.170.1624658608772; Fri, 25 Jun 2021 15:03:28 -0700 (PDT) Received: from localhost.name ([122.177.20.255]) by smtp.gmail.com with ESMTPSA id d9sm6374040pjx.13.2021.06.25.15.03.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 15:03:28 -0700 (PDT) From: Bhupesh Sharma To: linux-arm-msm@vger.kernel.org Cc: bhupesh.sharma@linaro.org, bhupesh.linux@gmail.com, balbi@kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, robh+dt@kernel.org, agross@kernel.org, Bjorn Andersson Subject: [PATCH 1/2] arm64: dts: qcom: Use consistent naming for dwc3 usb nodes for sm8150 Date: Sat, 26 Jun 2021 03:33:10 +0530 Message-Id: <20210625220311.527549-2-bhupesh.sharma@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625220311.527549-1-bhupesh.sharma@linaro.org> References: <20210625220311.527549-1-bhupesh.sharma@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The dwc3 usb nodes in sm8150.dtsi are currently named differently, leading to some confusion when one sees the entries in sysfs or dmesg: [ 1.943482] dwc3 a600000.usb: Adding to iommu group 1 [ 2.266127] dwc3 a800000.dwc3: Adding to iommu group 2 Name both the nodes as dwc3@ for consistency. While at it also arrange the two usb controller, hs-phy and ss-phy nodes closer in the dts for better readability. Cc: Bjorn Andersson Signed-off-by: Bhupesh Sharma --- arch/arm64/boot/dts/qcom/sm8150.dtsi | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 612dda0fef43..3be6d093a99b 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -2205,6 +2205,20 @@ glink-edge { }; }; + dc_noc: interconnect@9160000 { + compatible = "qcom,sm8150-dc-noc"; + reg = <0 0x09160000 0 0x3200>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + gem_noc: interconnect@9680000 { + compatible = "qcom,sm8150-gem-noc"; + reg = <0 0x09680000 0 0x3e200>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + usb_1_hsphy: phy@88e2000 { compatible = "qcom,sm8150-usb-hs-phy", "qcom,usb-snps-hs-7nm-phy"; @@ -2266,20 +2280,6 @@ usb_1_ssphy: lanes@88e9200 { }; }; - dc_noc: interconnect@9160000 { - compatible = "qcom,sm8150-dc-noc"; - reg = <0 0x09160000 0 0x3200>; - #interconnect-cells = <1>; - qcom,bcm-voters = <&apps_bcm_voter>; - }; - - gem_noc: interconnect@9680000 { - compatible = "qcom,sm8150-gem-noc"; - reg = <0 0x09680000 0 0x3e200>; - #interconnect-cells = <1>; - qcom,bcm-voters = <&apps_bcm_voter>; - }; - usb_2_qmpphy: phy@88eb000 { compatible = "qcom,sm8150-qmp-usb3-uni-phy"; reg = <0 0x088eb000 0 0x200>; @@ -2344,7 +2344,7 @@ usb_1: usb@a6f8800 { resets = <&gcc GCC_USB30_PRIM_BCR>; - usb_1_dwc3: usb@a600000 { + usb_1_dwc3: dwc3@a600000 { compatible = "snps,dwc3"; reg = <0 0x0a600000 0 0xcd00>; interrupts = ; From patchwork Fri Jun 25 22:03:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 12345963 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 B7214C48BC2 for ; Fri, 25 Jun 2021 22:03:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9CAF96197F for ; Fri, 25 Jun 2021 22:03:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230006AbhFYWF4 (ORCPT ); Fri, 25 Jun 2021 18:05:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230011AbhFYWFz (ORCPT ); Fri, 25 Jun 2021 18:05:55 -0400 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1682C0617A8 for ; Fri, 25 Jun 2021 15:03:33 -0700 (PDT) Received: by mail-pg1-x535.google.com with SMTP id u190so9300820pgd.8 for ; Fri, 25 Jun 2021 15:03:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O4ese8Y4+WSHdRNE0+R9rpSzI0msBCg5RrtNbTiIqXM=; b=Cv064OjNvDCHlDf/LlWl/Wj6EQ0ckksJX0ePjELby3NYPebamCDitDYh5UOh6dNsHH rY3hm8o/JQMdIFFYR+3K8IOw6FyccFk2ZseFoAdyBTNppN3sTH1u0ckoDTFyyQde1K+1 tZ8G36Rvynxree8SAW2lmKLbC1W3BXb38xvhknGkApAlMqzeJdxUzhE4ZHrkNdCQSKZp alsor1IFRdU4kwnMQmIBz9WhyvOkQrotoB0KxOsCnKB8BIVDWnLqlip+sI3SvLG6Bu7S uFTfYFb3CC+xcHOYMwkO0sZbnyfflZnSfiZFjC4xsb1XYhobJGQ0/5vuH83lYRNN1JUu Uz4w== 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:mime-version:content-transfer-encoding; bh=O4ese8Y4+WSHdRNE0+R9rpSzI0msBCg5RrtNbTiIqXM=; b=JU94ga4baoIgPEvzUI37QG8+8LSMFA6t+myKcivbcPK0k2C8XhjYqPCm2SR2uzr7V1 IJt5p/Uf41qUoLg7g2Ml6L9YsmpsdB440W8gwL0FQB6Fjhi6GT6VCWM7X/AHHQk83m/L qTI03nPbjvUwuakY7VD4g47Az4crx7cCEOUuOon3HGbA7Gubhd3/bMYAzCv6Rnw/FGow 6jLTPhM0TOzaBZ3Ey3E7l8jafmkwYlWOCTH3X7G7c9Yhmj0vSBbYeAj/FKGNMWOMPtza gi2K/2Ni3a24A2KVG6gL1VpiZy4dJcZQCm02alcjd7mssG7poe4MDaVzon2VIaf9m7zi Coog== X-Gm-Message-State: AOAM532m1+1hANMjRMH/mGmx19oF0205/d7ZtWqXERjkIdbuzMLl1qhL xKbPVoU8DG21BSAuNP0/DS3C4kBfJPW55g== X-Google-Smtp-Source: ABdhPJxe8S2kEQbTu6Z4fKxxr3Tm9HmzleVP6Kc8hVv16kFSf9Oc69fk4hi+1DqlmoQiTPdPp8Z/hA== X-Received: by 2002:aa7:88d6:0:b029:300:6247:8141 with SMTP id k22-20020aa788d60000b029030062478141mr12351002pff.47.1624658612953; Fri, 25 Jun 2021 15:03:32 -0700 (PDT) Received: from localhost.name ([122.177.20.255]) by smtp.gmail.com with ESMTPSA id d9sm6374040pjx.13.2021.06.25.15.03.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 15:03:32 -0700 (PDT) From: Bhupesh Sharma To: linux-arm-msm@vger.kernel.org Cc: bhupesh.sharma@linaro.org, bhupesh.linux@gmail.com, balbi@kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, robh+dt@kernel.org, agross@kernel.org, Bjorn Andersson Subject: [PATCH 2/2] arm64: dts: qcom: Fix usb entries for SA8155p adp board Date: Sat, 26 Jun 2021 03:33:11 +0530 Message-Id: <20210625220311.527549-3-bhupesh.sharma@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625220311.527549-1-bhupesh.sharma@linaro.org> References: <20210625220311.527549-1-bhupesh.sharma@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org SA8155p adp board has two USB A-type receptacles called USB-portB and USB-portC respectively. While USB-portB is a USB High-Speed connector/interface, the USB-portC one is a USB 3.1 Super-Speed connector/interface. Also the USB-portB is used as the USB emergency download port (for image download purposes). Enable both the ports on the board in USB Host mode (since all the USB interfaces are brought out to USB Type A connectors). Cc: Bjorn Andersson Signed-off-by: Bhupesh Sharma --- arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 60 ++++++++++++++++++++---- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts index 0da7a3b8d1bf..5ae2ddc65f7e 100644 --- a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts +++ b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts @@ -307,10 +307,6 @@ &qupv3_id_1 { status = "okay"; }; -&tlmm { - gpio-reserved-ranges = <0 4>; -}; - &uart2 { status = "okay"; }; @@ -337,6 +333,16 @@ &ufs_mem_phy { vdda-pll-max-microamp = <18300>; }; +&usb_1 { + status = "okay"; +}; + +&usb_1_dwc3 { + dr_mode = "host"; + + pinctrl-names = "default"; + pinctrl-0 = <&usb2phy_ac_en1_default>; +}; &usb_1_hsphy { status = "okay"; @@ -346,15 +352,51 @@ &usb_1_hsphy { }; &usb_1_qmpphy { + status = "disabled"; +}; + +&usb_2 { status = "okay"; - vdda-phy-supply = <&vreg_l8c_1p2>; - vdda-pll-supply = <&vdda_usb_ss_dp_core_1>; }; -&usb_1 { +&usb_2_dwc3 { + dr_mode = "host"; + + pinctrl-names = "default"; + pinctrl-0 = <&usb2phy_ac_en2_default>; +}; + +&usb_2_hsphy { status = "okay"; + vdda-pll-supply = <&vdd_usb_hs_core>; + vdda33-supply = <&vdda_usb_hs_3p1>; + vdda18-supply = <&vdda_usb_hs_1p8>; }; -&usb_1_dwc3 { - dr_mode = "peripheral"; +&usb_2_qmpphy { + status = "okay"; + vdda-phy-supply = <&vreg_l8c_1p2>; + vdda-pll-supply = <&vdda_usb_ss_dp_core_1>; +}; + +&tlmm { + gpio-reserved-ranges = <0 4>; + + usb2phy_ac_en1_default: usb2phy_ac_en1_default { + mux { + pins = "gpio113"; + function = "usb2phy_ac"; + bias-disable; + drive-strength = <2>; + }; + }; + + usb2phy_ac_en2_default: usb2phy_ac_en2_default { + mux { + pins = "gpio123"; + function = "usb2phy_ac"; + bias-disable; + drive-strength = <2>; + }; + }; };