From patchwork Sun Jun 27 11:46:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 12346725 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 C72BFC49EB7 for ; Sun, 27 Jun 2021 11:46:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A1CFE61C43 for ; Sun, 27 Jun 2021 11:46:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230292AbhF0LtF (ORCPT ); Sun, 27 Jun 2021 07:49:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230266AbhF0LtD (ORCPT ); Sun, 27 Jun 2021 07:49:03 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 473ACC0617A6 for ; Sun, 27 Jun 2021 04:46:39 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id x16so11584261pfa.13 for ; Sun, 27 Jun 2021 04:46:39 -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=u6hU3l+WPFPeSH4wQjhvp1YpUcglpCldBoZsu5dQtpI=; b=b8R2AneZnbX8PPDDPXYkgJUlXUDwvJNT42bL6aQ7hKUX41FQFDU+YANBjuhmVlW80w RjGb41Qzsw/uKqkPzW+gA0XpYc0WAXLZoqsZFlDMYvdJWf0FYczUlaV87mbL7DEz8N/y apgQ19hKZ1hGMNg9c2iB25Ds9KQ0RXevfgUD2H5T41Yembik3jekQ0olXFKxjnNAHPqS dZVaplG2bpVjHoTyjfVVH2x6zF0chajkTZ9vLKDR+BCEoVeJtb3S4PiWAK9ndR4BJvnQ TUWDpXAtU8wQ+3hY+67LpD2pso3C0UkPtyR3QiwowxwS+32K3L10jVHW8gb7sBmVBvAT 7ryw== 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=u6hU3l+WPFPeSH4wQjhvp1YpUcglpCldBoZsu5dQtpI=; b=iSCJ5TSYmlbtyXq7ZW9Z0bU4+xtpZI1FCi3zFB+UafEErgzn7Z2jz/TYZjpL19Qpfu ok4TlRtqDy16HXNjiE3QppLkCZ32XQ+qsJ0Yj/HYEffsM/BABtaZpdePZmM7kgbz+v2S OCQcRjSM+t1OB5M/Xk9ClJzVEsXesvFew08cOUf814Olz4LIkxOnlDt+5CVpTI6cFO1E BhS5Q/5H7Mo54Df//aieHwrs3BZ+yKBGbn2gosqisXzTin9oo0NgnIRjhif+anIw67qT De76m+E8Udatj6CAnU6+ivK9Qae2yiyDk+LmZWBzXdEX18TrMShHPyht4xjnymqplZ2p xnzw== X-Gm-Message-State: AOAM531ZfC9BgDkfviCKg7wvEPIUZiIfh2nw8RCrwVLd3sGEV+kAW6E2 EeN/lozSoqojBREzcJ0JL9sNdqdR9Qb93Q== X-Google-Smtp-Source: ABdhPJweancR/JKUhPGwBLPnVawpEDgcVCTXNT0G4vB5BxLchTtKtYBUFo49gOxNJOMooase+aRSDg== X-Received: by 2002:a63:25c5:: with SMTP id l188mr18457025pgl.283.1624794398588; Sun, 27 Jun 2021 04:46:38 -0700 (PDT) Received: from localhost.localdomain.name ([182.69.217.12]) by smtp.gmail.com with ESMTPSA id x21sm10768762pfu.211.2021.06.27.04.46.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Jun 2021 04:46:38 -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 v2 1/3] arm64: dts: qcom: Use correct naming for dwc3 usb nodes in dts files Date: Sun, 27 Jun 2021 17:16:14 +0530 Message-Id: <20210627114616.717101-2-bhupesh.sharma@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210627114616.717101-1-bhupesh.sharma@linaro.org> References: <20210627114616.717101-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 several arm64 qcom dts are currently named differently, somewhere as 'usb@' and somewhere as 'dwc3@', 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 the usb nodes as 'usb@' for consistency, which is the correct convention as per the 'snps,dwc3' dt-binding as well (see [1]). [1]. Documentation/devicetree/bindings/usb/snps,dwc3.yaml Cc: Bjorn Andersson Signed-off-by: Bhupesh Sharma Reviewed-by: Bjorn Andersson --- arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8250.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/sm8350.dtsi | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi index f9f0b5aa6a26..662f2f246b9b 100644 --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi @@ -430,7 +430,7 @@ usb3: usb@f92f8800 { power-domains = <&gcc USB30_GDSC>; qcom,select-utmi-as-pipe-clk; - dwc3@f9200000 { + usb@f9200000 { compatible = "snps,dwc3"; reg = <0xf9200000 0xcc00>; interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 612dda0fef43..9c931beeb614 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -2389,7 +2389,7 @@ usb_2: usb@a8f8800 { resets = <&gcc GCC_USB30_SEC_BCR>; - usb_2_dwc3: dwc3@a800000 { + usb_2_dwc3: usb@a800000 { compatible = "snps,dwc3"; reg = <0 0x0a800000 0 0xcd00>; interrupts = ; diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index 4798368b02ef..9c1462cc9dad 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -2321,7 +2321,7 @@ usb_1: usb@a6f8800 { resets = <&gcc GCC_USB30_PRIM_BCR>; - usb_1_dwc3: dwc3@a600000 { + usb_1_dwc3: usb@a600000 { compatible = "snps,dwc3"; reg = <0 0x0a600000 0 0xcd00>; interrupts = ; @@ -2372,7 +2372,7 @@ usb_2: usb@a8f8800 { resets = <&gcc GCC_USB30_SEC_BCR>; - usb_2_dwc3: dwc3@a800000 { + usb_2_dwc3: usb@a800000 { compatible = "snps,dwc3"; reg = <0 0x0a800000 0 0xcd00>; interrupts = ; diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi index 0d16392bb976..a631d58166b1 100644 --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi @@ -1273,7 +1273,7 @@ usb_1: usb@a6f8800 { resets = <&gcc GCC_USB30_PRIM_BCR>; - usb_1_dwc3: dwc3@a600000 { + usb_1_dwc3: usb@a600000 { compatible = "snps,dwc3"; reg = <0 0x0a600000 0 0xcd00>; interrupts = ; @@ -1317,7 +1317,7 @@ usb_2: usb@a8f8800 { resets = <&gcc GCC_USB30_SEC_BCR>; - usb_2_dwc3: dwc3@a800000 { + usb_2_dwc3: usb@a800000 { compatible = "snps,dwc3"; reg = <0 0x0a800000 0 0xcd00>; interrupts = ; From patchwork Sun Jun 27 11:46:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 12346727 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=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 C2FD7C48BC2 for ; Sun, 27 Jun 2021 11:46:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4004619A1 for ; Sun, 27 Jun 2021 11:46:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230386AbhF0LtL (ORCPT ); Sun, 27 Jun 2021 07:49:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230299AbhF0LtI (ORCPT ); Sun, 27 Jun 2021 07:49:08 -0400 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 338F5C061768 for ; Sun, 27 Jun 2021 04:46:43 -0700 (PDT) Received: by mail-pl1-x62b.google.com with SMTP id b1so758948pls.5 for ; Sun, 27 Jun 2021 04:46:43 -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=eEW2XE8K/ptfzE2ev+8+PL6o0bAxnSmLR8LwfhdyI9Q=; b=LttWFLo16LnaXvHbfVD0RFyMqIH6wDbctTNhtEZRcR106xl1T1Qzonqa5a/vDdD1OQ RpwH6FhJMo4UGIATuwKl+TVSOoFuwAQV7TorsT90+TD98BgnEErxgxgp2bYyS7GBeno5 l1g4cIeuMbH9TbzN7QzjWUBn/pVzQrsz4MJlEofX2KMucu/RbnbrXbTaDle2OgrlIwnK xJBuHysfT94HJuCJz0Jg0TTEjDAHVxw33b51wYss/yobv2T7sY33rCfOjHnM510lIvDl ZRP3XbCqzTtCu69NoN0wbNHm9VxVtUh90zmo61nh1680X7/H9EQKN5pH3PyswuV12ILF xWXQ== 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=eEW2XE8K/ptfzE2ev+8+PL6o0bAxnSmLR8LwfhdyI9Q=; b=fUyNyEKEExxXeOxWcfe+foO8aHB5a3akN+NclF/pD4jvVoPfZpgSMkwCfS3PoX2w/V MEUqLmsLxhbYygxLbBlDXyx/jpIdhLC7L5oXESqh8pg3GVSCESodwofn9CFGMQZgv3Fl bvPwxGDh3b0Zy402gN1nvGJFgdAsUxIc+631tHL7CXq/bM9K+hgC4OeZyCcNOYR7AXyN er/TaLPMRYs5UBtHKSZqEwCwlLdp45esC8LIqpMSFXf/zzVlpdtfjMQ+bQAQ6qz1rbZ+ y5NzJEXCUqdB8BsFYOJ5Pm1Y2IE1kxs69Nigcb675qJAvPIQo6ImWXCDFewF55kZ0GT2 k6Jg== X-Gm-Message-State: AOAM532JoniJi2aGNdgapM8OYwW0OEPoftHM+XaqUmAAoJWjD4y/60jm Yn5O/nVkZCWRq7jG7m6CaKc5h4A5lvlDcA== X-Google-Smtp-Source: ABdhPJz6QZmqqeMQxEIAlavuKtdk4d4cXuuEDs2MDRTzO79rNRLSIzPT0L6t0cmwnRz1eKcX+KE5vg== X-Received: by 2002:a17:90a:8a83:: with SMTP id x3mr3828443pjn.157.1624794402614; Sun, 27 Jun 2021 04:46:42 -0700 (PDT) Received: from localhost.localdomain.name ([182.69.217.12]) by smtp.gmail.com with ESMTPSA id x21sm10768762pfu.211.2021.06.27.04.46.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Jun 2021 04:46:42 -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 v2 2/3] arm64: dts: qcom: Cosmetic changes - arrange USB nodes together in sm8150 dts Date: Sun, 27 Jun 2021 17:16:15 +0530 Message-Id: <20210627114616.717101-3-bhupesh.sharma@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210627114616.717101-1-bhupesh.sharma@linaro.org> References: <20210627114616.717101-1-bhupesh.sharma@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 9c931beeb614..163eb430eb1e 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>; From patchwork Sun Jun 27 11:46:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 12346729 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 E6335C49EB9 for ; Sun, 27 Jun 2021 11:46:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D211B619A1 for ; Sun, 27 Jun 2021 11:46:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230339AbhF0LtO (ORCPT ); Sun, 27 Jun 2021 07:49:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230299AbhF0LtM (ORCPT ); Sun, 27 Jun 2021 07:49:12 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39037C061767 for ; Sun, 27 Jun 2021 04:46:47 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id g192so11618419pfb.6 for ; Sun, 27 Jun 2021 04:46:47 -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=nVb5stkeaeNQ8buPNs61WvCH1er+AICUAQcXdQdLxnb5sk7nQdcvGDjRyvDxo6d5Z3 c1Iiaokbd+JaLkjKK+n4n9Dx1nndITendOSzmr0rEXsM9nXABIfFyd9sWNyt3Tnq+b8G +TTf4guAndZpHSlPnceiwYDlw5WieSbf7ThGgIerUOEoswo0sddjXsj2nZRtw3Qcn/2i dyixK72zMEdmlDpwM7TQDL2IpUElV3LhmoXlnwixnycPu3b8/mXGFRrNNSEXbs7L49tD PPYwruMvYD9q9Ki0vG2q257pp/pXF/HUBMNGio7eTsLcLtMeWBTUS8Q1QLEsDgKuUZ+Y T1Bg== 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=LbdRecm5E6YsB+Y0EmJNXEkM6qiXnJ7Sj8Nxl6clb0z5CU9vgwCI1ItKS23fHk7Eyv 0E0wEvu+LoknYv8u+7UCSMksjsIUXwOP7mt8yzSYApM0dav7Wetv7fr0VlicEjk0w2OI CCaF1EBYlB5KulAjf2XXn2ct5IxL+trpkai1hdeL0/hRm7d3d5DwRCvyVqVQNNoh0hH6 4KvHOqPoBHnVa+KD2IuRJfe0I9Qb6w6rvhB5W+DCQQ3RnaOn+I4GjArG7IwSu3doChsx 6xBP4F31sMAGBSJXVbTWVkd+cHP0CZPa5P4lSWmLwdY64cnx44becBBys+qkZdOKRvPF mEKQ== X-Gm-Message-State: AOAM533SM8ICMrxk0FX8QqP4ykPTK0TCHfr0gg8tFqqTzT71quG9MRJd zlbmIwETVd1i0M0BFXfGBwhjKEsjF+AL6g== X-Google-Smtp-Source: ABdhPJx3LZcJukcrbcfsvVeDaJoyiQ/nfSzhVWYY535qQUouD5lbapa7I6R4eHxKtQsFr1o+utk9LQ== X-Received: by 2002:a62:4e01:0:b029:30b:fba7:1b62 with SMTP id c1-20020a624e010000b029030bfba71b62mr1489514pfb.66.1624794406628; Sun, 27 Jun 2021 04:46:46 -0700 (PDT) Received: from localhost.localdomain.name ([182.69.217.12]) by smtp.gmail.com with ESMTPSA id x21sm10768762pfu.211.2021.06.27.04.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Jun 2021 04:46:46 -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 v2 3/3] arm64: dts: qcom: Fix usb entries for SA8155p adp board Date: Sun, 27 Jun 2021 17:16:16 +0530 Message-Id: <20210627114616.717101-4-bhupesh.sharma@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210627114616.717101-1-bhupesh.sharma@linaro.org> References: <20210627114616.717101-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>; + }; + }; };