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: 466863 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp1894569jao; Fri, 25 Jun 2021 15:03:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyHNmr4VqLSqRMVo3lae0Q5flnEZsePGGAzKu5GRZXX5xwrm5zjxaV35Qy4twQUpIlULmIZ X-Received: by 2002:a05:6638:380b:: with SMTP id i11mr11127714jav.57.1624658610838; Fri, 25 Jun 2021 15:03:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624658610; cv=none; d=google.com; s=arc-20160816; b=wCmWlxAFF705YxR5ZsqMtX62o1RSfPuVgH2qwYZ3Q3+/1yxY8CVat2iZkPbaThsWA5 cjicYaFN1CcOv266AEAvfR1+mVWtGzxJSi6Y6bJsgeLEdn8j4z2SYyTOYUvXGppl1DwD oAXBNknNE5/nxu/hWxRreZlMYprzDOyvwOTBTSYPNXxAu6et1RAajCxVEWitskmrYkxW S1/wyqMcIROYUgpjH1+mBax2r1C91Xf9TPPCBIwJWeUNijhs5bTsXErM80u7jb8EaLL/ HIKB7jedH+JN7/8recIp3vOYECuVBr6F2hqu4aALEgs7+Jntgfbybw4WfTJgPLlIuFnz zigg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=prINlRYKbu6XDrHyKyHoo1qSGCIglO6qKAztYX5cZo8=; b=Snx/iEfwI8OvbpY5OUW4OYecLCjo3Nl9VJ1LmzvpWktmjWp5UcIe9WOJEwXYyw25Fm dj13MPrqm093JYOLKrRAceLxgtG+L8G+LXE/l5EMyF+02FySxna3fINWx47jv5Pmhwpt iquwRgBWVULiZFuSm3j0dUdU7EmyRkkRlBgrCukffG4ZO3w+zXjEnESN6gmKx4ZVszk7 uXhs9js8F5FYgaGKsd1SMl2T+WfttEXYVvuWqnyWZ8MDZClRjgHDt7QCHuzLM7Avqh9M fz6JPVZ8QG5MQPJ2gti/AmDvQc8fCdOgWGmnpuF2eoAS4Ri7luG7zzVxXUNS48E9BLnr INmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xWYLw2kh; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s17si2745348ilo.141.2021.06.25.15.03.30; Fri, 25 Jun 2021 15:03:30 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xWYLw2kh; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229940AbhFYWFv (ORCPT + 7 others); Fri, 25 Jun 2021 18:05:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229776AbhFYWFu (ORCPT ); Fri, 25 Jun 2021 18:05:50 -0400 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32CAAC061766 for ; Fri, 25 Jun 2021 15:03:29 -0700 (PDT) Received: by mail-pg1-x534.google.com with SMTP id p9so9303700pgb.1 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=ThrRgXmd1MrJAnoOYPY3PuqNYIRKSYkEK3hB5pvrPg0L2UzBRPS47DQl+0Kbc9FnXa AJRxfmUC57eaLRxTgGn2UbNNInMrokI5GJDTtnw0Ds0eVAPzxVEZZchF/+UvfUT24sTG FdqUpi9h/u+sYJ0Z4a7iynJfczWAIq+HrFlUam72+rkQ90cTqAyXOuLSFak3qsP0CC4z D3LxtXuZzoOmArT7edu4izHx83HIOvTLuXxQVtBBLebCDQ4xHxt5Y/pV3jztDR2Pf5tn 8J6gjWeh2M2KdcVy48zCJALgcFLbmWyC9vVFJY/kgqglCNifKlk94cOlJwP3rX8kpdfH brTg== X-Gm-Message-State: AOAM533Xf/aOgwiZ22WHJAEacOoLGdTWs7yCx2KAgXHGocGXTP1LG+zh TxW0GXo3fZIrzK/MKM4QDxsuEA== 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: devicetree@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(-) -- 2.31.1 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: 466864 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp1894688jao; Fri, 25 Jun 2021 15:03:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWhRYQLygIEDNf8IdDz0l3KPAR9GQGzRntYaezaMO9Y8OCR7Eer4VIFLlW20iTwIoSqH88 X-Received: by 2002:a92:194b:: with SMTP id e11mr8473709ilm.38.1624658618607; Fri, 25 Jun 2021 15:03:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624658618; cv=none; d=google.com; s=arc-20160816; b=OS5Kav8QLdIpy8ojLVUY3aIRJ/6AvhgwS0y2/9n0KTgv4p1ETSAE+x/Kd75baS3puh c971IHu3dWo96BA1qKvU2mdTQEGp/4oCz96ltUN/lytRYLN/+RVCklvv2MlQPoBlM6Yk hMIDANzuQtmDJ4lZsuRSiDBBJD837u6lBoM8q826pmlaRzPzXKHRCzgyoksfNhfp5sUj EYvw4p5j1QgPQoyUDMKX3HvItFJ0OdwB/JiBrKOc/VpbND1c5Kz4Z9S0SIsAeXHTsIxj OM2+0Y6lye/99TmkjVEepUQZUDanGAmnSENLwxTH/elDAyoZwmzE+gxEe1JIMNEOCVHN TkBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=O4ese8Y4+WSHdRNE0+R9rpSzI0msBCg5RrtNbTiIqXM=; b=0iToPFyNqBLDaagIbHXGX2WIFYyZgEB67tfhEc6QxWV4WH9EjqiEqgedF4RbRBRkqP e3rjCGEHznaB1q1t7ZY8ReX41tUYURmFdZBeT6xpabDC5r/qhJXPJEsH2QMV+pHBx9ru YLuumGgHBOhez2s+fZIYAu3eIbaJ0TKO8tdsECUF2Uh1nJd69GlsieKibzN8+OvpLTom Emnl46QB8Nr+uqtjNzMXO6t1Y2rQXuPMFOvCU5BQ8VoKj2ER9nNLrUQMksC9mJpp/YcQ 942Xouq6lbyrNXEB54S9GiAJtALRm58EQU0Rap6ymIkcXjTEEya4+4shtqGZgHQsCqEc 0eXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Cv064OjN; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s13si8386386jat.111.2021.06.25.15.03.38; Fri, 25 Jun 2021 15:03:38 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Cv064OjN; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230002AbhFYWFz (ORCPT + 7 others); Fri, 25 Jun 2021 18:05:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229994AbhFYWFy (ORCPT ); Fri, 25 Jun 2021 18:05:54 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65AB7C061574 for ; Fri, 25 Jun 2021 15:03:33 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id s14so7260078pfg.0 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=VAeCRs1LFIBJbDKB2K7uVNSE3vWjFZyLzdN77KY+DJnLM2xvHkOHaNv2mBJFidxhae xu+YfRTWCz6cT5hHf0Xigy4Qz7/8FCbe4XKZ4BIAjhHiOTE2ZCDr9R9xA2aH0Ka8LEPG VbIfypCivouRea4FffK7VhanxK+2tDYIjPYlfurysxYP23vkbeKuKycsbOoEOQChmzIa SzhoqVbPoZ+LmrH9UsF9H+VheqYdFd++Fl+fJtOImMxn+Lm3y2OBiRM5TtFT/FBUi/5r h9WlNYg8yJTFv9jFOj5lgjulMiXN6M9B2wS8GK1TpGDJchRsnJNuP0ISKcQmTjwFElQT 5cdQ== X-Gm-Message-State: AOAM531Gw721U2mgv7z/N/AvZiBiAoyWX54qAJ1uBU9/DPME+TF35+Z5 rG6RTRJC4WfZ/ibuSHaepiSxgg== 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: devicetree@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(-) -- 2.31.1 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>; + }; + }; };