From patchwork Wed Apr 5 19:16:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 670425 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 91D3FC7619A for ; Wed, 5 Apr 2023 19:19:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234526AbjDETTa (ORCPT ); Wed, 5 Apr 2023 15:19:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234091AbjDETTS (ORCPT ); Wed, 5 Apr 2023 15:19:18 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B86926181 for ; Wed, 5 Apr 2023 12:19:17 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id p3-20020a17090a74c300b0023f69bc7a68so38288151pjl.4 for ; Wed, 05 Apr 2023 12:19:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680722357; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nt7M02oqu6KTx155BRHBlS3z+3ibHCaV+H3c4NDslQk=; b=svFkAQDPQ6lQfJOy3eX2VKdwwi9AG2pmGyTJt3q8YsxggmR0MxczaTHGDaotjex1ZO RbbVpQVur6VgIgNdFu3VJUYmc+HTnw1RydgsvixTJ93qXriZVDZiCgeqWl+6zxtYcNQ1 AfiKpiiQmnAY5Ybr8Ay9efQIJus6Hvc/k2XdGj9AX96M1pLdGkkQXCavOu9+DSHgoDSk 3e0l5f2gEDkd4y9vUi+9pzVa2/GkbFjAcxLO30sgfV9VCJ2j59VBt7wctYuEbQmrWtZ2 suWIEjXI2ESpngeQEPxMaINxc3KjO8M4YOJIvKPxm45NNQCSU6SokjZPJULyOTyYyhEK bAbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680722357; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nt7M02oqu6KTx155BRHBlS3z+3ibHCaV+H3c4NDslQk=; b=Rh/RCikU9MawJDcspe84PFjKz0Dww2tT8UbwTHkFxaePp3jOrHEkNXwdr6AkKpmJeK kOjsFVJpi3ecqa3qqmIoh2rnB2MyTdEhAoq46c4lWDRG2aAZX3VsO3EZkEOpZA2WHreT Adkhrv3x5vl99LQj2sOSolwQAaiaW17JugOjQi6jwioVLQb40XQbS6tNC4JJGjaXDT/j 6NzSOM42bYzE8IzUTBSlY6NdLJIv+l8m2kDuBrbeJZW7DM55Ku1ewhWUl8JIPAW8BCaW AkWn0FTJBeTX8zsGKhmKh0ml752jRIdIttbiID1Fgj//zaFXTJFKnuv+JHUeI+JK2901 tBJg== X-Gm-Message-State: AAQBX9f+F1OLX3CoFgpf6Rjz3lsym3uPUIK6u5m8YQ8vY7clVMxYC2Qa iUJf8uWONeGNHLDO4rMigBP0Tpx2wDkTIn/e7Iw= X-Google-Smtp-Source: AKy350b5JJdiYtWrN/RCf8v35EVXFdkifQOPo8juFYtwRgi6PZ7VfAaOzPfZ1PQwnNrV2zwYHiig1A== X-Received: by 2002:a17:902:e18c:b0:19d:297:f30b with SMTP id y12-20020a170902e18c00b0019d0297f30bmr6156444pla.19.1680722356788; Wed, 05 Apr 2023 12:19:16 -0700 (PDT) Received: from localhost.localdomain ([223.233.67.41]) by smtp.gmail.com with ESMTPSA id d9-20020a170902aa8900b001a1d7329235sm10478097plr.234.2023.04.05.12.19.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 12:19:16 -0700 (PDT) From: Bhupesh Sharma To: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-phy@lists.infradead.org Cc: agross@kernel.org, linux-kernel@vger.kernel.org, andersson@kernel.org, bhupesh.sharma@linaro.org, bhupesh.linux@gmail.com, krzysztof.kozlowski@linaro.org, robh+dt@kernel.org, konrad.dybcio@linaro.org, kishon@kernel.org, vkoul@kernel.org, krzysztof.kozlowski+dt@linaro.org Subject: [PATCH v5 1/2] dt-bindings: phy: qcom,qmp-usb: Fix phy subnode for SM6115 & QCM2290 USB3 PHY Date: Thu, 6 Apr 2023 00:46:32 +0530 Message-Id: <20230405191633.1864671-2-bhupesh.sharma@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230405191633.1864671-1-bhupesh.sharma@linaro.org> References: <20230405191633.1864671-1-bhupesh.sharma@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The USB3 SS (QMP) PHY found on Qualcomm SM6115 & QCM2290 SoCs is similar to sm8150 QMP PHY (which is named as 'usb_1_qmpphy' in sm8150 dtsi file, see [1]) in the sense that the phy subnode supports 6 regs, namely TX lane 1, RX lane 1, PCS, TX lane 2, RX lane 2 and PCS_MISC. Update the dt-bindings document to reflect the same. [1]. https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/arch/arm64/boot/dts/qcom/sm8150.dtsi#n3394 Acked-by: Krzysztof Kozlowski Signed-off-by: Bhupesh Sharma --- .../devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml index e81a38281f8c..1575dc70bcf2 100644 --- a/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml +++ b/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml @@ -276,7 +276,9 @@ allOf: compatible: contains: enum: + - qcom,qcm2290-qmp-usb3-phy - qcom,sdm845-qmp-usb3-phy + - qcom,sm6115-qmp-usb3-phy - qcom,sm8150-qmp-usb3-phy - qcom,sm8350-qmp-usb3-phy - qcom,sm8450-qmp-usb3-phy @@ -318,12 +320,10 @@ allOf: enum: - qcom,ipq6018-qmp-usb3-phy - qcom,ipq8074-qmp-usb3-phy - - qcom,qcm2290-qmp-usb3-phy - qcom,sc7180-qmp-usb3-phy - qcom,sc8180x-qmp-usb3-phy - qcom,sdx55-qmp-usb3-uni-phy - qcom,sdx65-qmp-usb3-uni-phy - - qcom,sm6115-qmp-usb3-phy - qcom,sm8150-qmp-usb3-uni-phy - qcom,sm8250-qmp-usb3-phy then: From patchwork Wed Apr 5 19:16:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 671632 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 28FB5C76188 for ; Wed, 5 Apr 2023 19:19:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234574AbjDETTd (ORCPT ); Wed, 5 Apr 2023 15:19:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234521AbjDETTa (ORCPT ); Wed, 5 Apr 2023 15:19:30 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FCF17282 for ; Wed, 5 Apr 2023 12:19:22 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id gp15-20020a17090adf0f00b0023d1bbd9f9eso40578771pjb.0 for ; Wed, 05 Apr 2023 12:19:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680722361; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0XxX9v4o0e9A74KVKINLnIuAStvu5tpKtcGeS/xTyjw=; b=r1mhd2GF/+9tjdL87AbcmzOd3rkhNQV3KxOpogVAVFo6FU6ZsRwSgp8KQYMOVXLixh PwJw5uUAkRxgRk2gDFcm3oVKXidT+XVIVFIVDzaA0oM+Nfv5TFi9lst4S6uwuMiEaZCu zZeo2pIzSvAsXStGJ6aySOim5IRqZXz1wqbD4VYRdHiTUM+POVdtvj2XKeXZRtvpXrvx vUqy5/1BG/EnCMlDwJenhiH0HqCG59WA85iTkCDRVG7JRm+5jR6Diyfj0Thi+tbOSU2B cZLMx4VQ1gpiGV35Eb6OEgF2kKHdtQK7EokKWI02pWEJJW43v0D8m72a1/GjHPNdVoUo dPOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680722361; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0XxX9v4o0e9A74KVKINLnIuAStvu5tpKtcGeS/xTyjw=; b=DUbby+j5HT+FQdNZ1vqkPz8QMw0YnzDL+ag9sLT0aoc9uner5wgm8dAtVtfUElkH++ N5KmMDZ81SvOI1RvZOgdtrQDdEmTk02gwxd+wPaq6Jt9XT52+yAlDSDaQrbP57l2lzfg Vf6IaUoEali0iIq/ov8ZnPRXJwXfyioRMyRHlLjQkTP/gv55WdYAbQIUAmUXvaqPpAVk g43V4Vc3Aiia2uhauw1b2FUI+Qt2PmouBSwYTAWCDXQDtfXOmF4eyKEmf4OWhs6yMGj9 AHgYx/l3kUy49s+FX/fHJlbJUznME7eze3uHgzvx3BXAdmcOCTZvwz8PuAutSIaJQoKW zzuw== X-Gm-Message-State: AAQBX9cXJp6CYLj5h85qPlxbOUJc3J56v7jVrBE7aw1rp0pWpi1u/tLv ovM1xtuUQ6bwlk//YKrfSYCwgmqzOJ/YlX3Xh20= X-Google-Smtp-Source: AKy350bW7kORq9ng9TSwhF++9ITY36DTz8cCbabmYwBSnB2TYNOCb94n80FxqeGGQTsYBt5H/92SPg== X-Received: by 2002:a17:90a:3ec3:b0:23d:39e:6054 with SMTP id k61-20020a17090a3ec300b0023d039e6054mr3679223pjc.5.1680722361664; Wed, 05 Apr 2023 12:19:21 -0700 (PDT) Received: from localhost.localdomain ([223.233.67.41]) by smtp.gmail.com with ESMTPSA id d9-20020a170902aa8900b001a1d7329235sm10478097plr.234.2023.04.05.12.19.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 12:19:21 -0700 (PDT) From: Bhupesh Sharma To: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-phy@lists.infradead.org Cc: agross@kernel.org, linux-kernel@vger.kernel.org, andersson@kernel.org, bhupesh.sharma@linaro.org, bhupesh.linux@gmail.com, krzysztof.kozlowski@linaro.org, robh+dt@kernel.org, konrad.dybcio@linaro.org, kishon@kernel.org, vkoul@kernel.org, krzysztof.kozlowski+dt@linaro.org Subject: [PATCH v5 2/2] arm64: dts: qcom: sm6115: Add USB SS qmp phy node Date: Thu, 6 Apr 2023 00:46:33 +0530 Message-Id: <20230405191633.1864671-3-bhupesh.sharma@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230405191633.1864671-1-bhupesh.sharma@linaro.org> References: <20230405191633.1864671-1-bhupesh.sharma@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add USB superspeed qmp phy node to dtsi. Make sure that the various board dts files (which include sm4250.dtsi file) continue to work as intended. Signed-off-by: Bhupesh Sharma --- .../boot/dts/qcom/sm4250-oneplus-billie2.dts | 3 ++ arch/arm64/boot/dts/qcom/sm6115.dtsi | 36 +++++++++++++++++-- .../boot/dts/qcom/sm6115p-lenovo-j606f.dts | 3 ++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts index a1f0622db5a0..75951fd439df 100644 --- a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts +++ b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts @@ -242,6 +242,9 @@ &usb { &usb_dwc3 { maximum-speed = "high-speed"; dr_mode = "peripheral"; + + phys = <&usb_hsphy>; + phy-names = "usb2-phy"; }; &usb_hsphy { diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi index 2a51c938bbcb..b2fa565e4816 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -650,6 +650,38 @@ usb_hsphy: phy@1613000 { status = "disabled"; }; + usb_qmpphy: phy@1615000 { + compatible = "qcom,sm6115-qmp-usb3-phy"; + reg = <0x0 0x01615000 0x0 0x200>; + clocks = <&gcc GCC_AHB2PHY_USB_CLK>, + <&gcc GCC_USB3_PRIM_CLKREF_CLK>, + <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>; + clock-names = "cfg_ahb", + "ref", + "com_aux"; + resets = <&gcc GCC_USB3PHY_PHY_PRIM_SP0_BCR>, + <&gcc GCC_USB3_PHY_PRIM_SP0_BCR>; + reset-names = "phy_phy", "phy"; + status = "disabled"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + usb_ssphy: phy@1615200 { + reg = <0x0 0x01615200 0x0 0x200>, + <0x0 0x01615400 0x0 0x200>, + <0x0 0x01615c00 0x0 0x400>, + <0x0 0x01615600 0x0 0x200>, + <0x0 0x01615800 0x0 0x200>, + <0x0 0x01615a00 0x0 0x100>; + #clock-cells = <0>; + #phy-cells = <0>; + clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; + clock-names = "pipe0"; + clock-output-names = "usb3_phy_pipe_clk_src"; + }; + }; + qfprom@1b40000 { compatible = "qcom,sm6115-qfprom", "qcom,qfprom"; reg = <0x0 0x01b40000 0x0 0x7000>; @@ -1100,8 +1132,8 @@ usb_dwc3: usb@4e00000 { compatible = "snps,dwc3"; reg = <0x0 0x04e00000 0x0 0xcd00>; interrupts = ; - phys = <&usb_hsphy>; - phy-names = "usb2-phy"; + phys = <&usb_hsphy>, <&usb_ssphy>; + phy-names = "usb2-phy", "usb3-phy"; iommus = <&apps_smmu 0x120 0x0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; diff --git a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts index 10c9d338446c..d60cc024749b 100644 --- a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts +++ b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts @@ -280,6 +280,9 @@ &usb { &usb_dwc3 { maximum-speed = "high-speed"; dr_mode = "peripheral"; + + phys = <&usb_hsphy>; + phy-names = "usb2-phy"; }; &usb_hsphy {