From patchwork Fri Apr 7 06:11:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 671266 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 BF87CC76196 for ; Fri, 7 Apr 2023 06:11:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233146AbjDGGLl (ORCPT ); Fri, 7 Apr 2023 02:11:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232918AbjDGGLk (ORCPT ); Fri, 7 Apr 2023 02:11:40 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0545F93F9 for ; Thu, 6 Apr 2023 23:11:39 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-23cfbaef575so38630a91.3 for ; Thu, 06 Apr 2023 23:11:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680847898; 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=wsyeQXy2xW6CfVtCD6z7F80PD3154E+msxA/B8ME+4s=; b=TxaHigEq/powxt8G0YFWCXnhy0gHw5R4nSEaBXCc2cQZqagDXWat0bd9Zh3uLL7zSO QsY7o+RvJ+WTiTAaFzURH7O76/opFYBjzsmtbkZWv5EpsTrPqSbMmbRDhXYYhh06vX0A d7sRTztRarC/f662JZc5E+dGQDLwX0mpFZrbzbzoq+c2vEh9VrKvlaC5msEMnBqyszgY wZDb8CDlOp5ExQugSSSK63+TJr61lWfanxcJsAm3kv9mny+/IrgN9SODSovp/8N3nyYB 1n0oAe3EOrNQhpQCEyojkNCKRUcJZ2obdHmQcbM+JNvobXmcGZRmHx6dKBAzFg+FD/Zi M2SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680847898; 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=wsyeQXy2xW6CfVtCD6z7F80PD3154E+msxA/B8ME+4s=; b=1s5pd6E3gIeNI84d1Pm1bjoPdd7m1EGBXjDW5+4stCf0wEml3wnL86NgX5uLYKxm8G FMw21hS546qEkkUDDZqOFKp6UrguInDp/sBF+dw/hMJVCK+XlETgFA+3gnw/n8/eRE0I mzD7096MHsxP5QRijIG5O3WS/9UPgWVcyY3tlpHtU6TaBoe2WnKzRVFYZt5k8KTdYrCJ sl08FbGHClE/fnVVp8cGFBkudktdkCs+RJVo4NVmznEIazAy7ZxVJGb3h2BfiMhbmXnu ztKXnKrSNVmnFOjC5W1j6aENKqUnQGcBtG1idIQZpRzNOHJTfL1PXYjLFtLUQN5bGVUE F+Qg== X-Gm-Message-State: AAQBX9dzV1u0pKwSobwfbjwPquds/WgBWNjOgjZ6/dEWQUyIeYPCe6fN ZsznPe27jyVnpW0ErrPX3gixLQ== X-Google-Smtp-Source: AKy350aR5pK8ttJepHEzseIhmBm6LXUUcc0dnTi5V1bRjzde3iRWNT3mv/x+VCZxMYrai5Vr70S1og== X-Received: by 2002:a62:52d0:0:b0:62e:43ce:e6ab with SMTP id g199-20020a6252d0000000b0062e43cee6abmr1346096pfb.13.1680847898470; Thu, 06 Apr 2023 23:11:38 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:1c60:6a11:8ba1:beba:def7:a4ae]) by smtp.gmail.com with ESMTPSA id u25-20020aa78399000000b0062d7e9bb17asm2253879pfm.81.2023.04.06.23.11.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 23:11:38 -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 v6 1/2] dt-bindings: phy: qcom,qmp-usb: Drop legacy bindings and move to newer one (SM6115 & QCM2290) Date: Fri, 7 Apr 2023 11:41:21 +0530 Message-Id: <20230407061122.2036838-2-bhupesh.sharma@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230407061122.2036838-1-bhupesh.sharma@linaro.org> References: <20230407061122.2036838-1-bhupesh.sharma@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 'qcom,msm8996-qmp-usb3-phy.yaml' defines bindings for several PHYs which predate USB -> USB+DP migration. Since SM6115 and QCM2290 nodes for USB QMP phy are being added to dtsi files by followup patches, move these bindings instead to the newer style 'qcom,sc8280xp-qmp-usb3-uni-phy.yaml' file. Since no device trees use these bindings presently, so we have no ABI breakages with this patch. Signed-off-by: Bhupesh Sharma --- .../phy/qcom,msm8996-qmp-usb3-phy.yaml | 27 ----- .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 109 +++++++++++++++++- 2 files changed, 104 insertions(+), 32 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..4c96dab5b9e3 100644 --- a/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml +++ b/Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml @@ -23,14 +23,12 @@ properties: - qcom,ipq8074-qmp-usb3-phy - qcom,msm8996-qmp-usb3-phy - qcom,msm8998-qmp-usb3-phy - - qcom,qcm2290-qmp-usb3-phy - qcom,sc7180-qmp-usb3-phy - qcom,sc8180x-qmp-usb3-phy - qcom,sdm845-qmp-usb3-phy - qcom,sdm845-qmp-usb3-uni-phy - qcom,sdx55-qmp-usb3-uni-phy - qcom,sdx65-qmp-usb3-uni-phy - - qcom,sm6115-qmp-usb3-phy - qcom,sm8150-qmp-usb3-phy - qcom,sm8150-qmp-usb3-uni-phy - qcom,sm8250-qmp-usb3-phy @@ -248,29 +246,6 @@ allOf: - const: phy - const: common - - if: - properties: - compatible: - contains: - enum: - - qcom,qcm2290-qmp-usb3-phy - - qcom,sm6115-qmp-usb3-phy - then: - properties: - clocks: - maxItems: 3 - clock-names: - items: - - const: cfg_ahb - - const: ref - - const: com_aux - resets: - maxItems: 2 - reset-names: - items: - - const: phy_phy - - const: phy - - if: properties: compatible: @@ -318,12 +293,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: diff --git a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml index 16fce1038285..ae207ce5f0c0 100644 --- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml +++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml @@ -16,20 +16,28 @@ description: properties: compatible: enum: + - qcom,qcm2290-qmp-usb3-phy - qcom,sc8280xp-qmp-usb3-uni-phy + - qcom,sm6115-qmp-usb3-phy reg: maxItems: 1 + "#address-cells": + enum: [ 1, 2 ] + + "#size-cells": + enum: [ 1, 2 ] + + ranges: true + clocks: + minItems: 3 maxItems: 4 clock-names: - items: - - const: aux - - const: ref - - const: com_aux - - const: pipe + minItems: 3 + maxItems: 4 power-domains: maxItems: 1 @@ -55,6 +63,42 @@ properties: "#phy-cells": const: 0 +patternProperties: + "^phy@[0-9a-f]+$": + type: object + description: single PHY-provider child node + properties: + reg: + minItems: 3 + maxItems: 6 + + clocks: + items: + - description: PIPE clock + + clock-names: + deprecated: true + items: + - const: pipe0 + + "#clock-cells": + const: 0 + + clock-output-names: + maxItems: 1 + + "#phy-cells": + const: 0 + + required: + - reg + - clocks + - "#clock-cells" + - clock-output-names + - "#phy-cells" + + additionalProperties: false + required: - compatible - reg @@ -71,6 +115,61 @@ required: additionalProperties: false +allOf: + - if: + properties: + compatible: + contains: + enum: + - qcom,qcm2290-qmp-usb3-phy + - qcom,sm6115-qmp-usb3-phy + then: + properties: + clocks: + maxItems: 3 + clock-names: + items: + - const: cfg_ahb + - const: ref + - const: com_aux + + - if: + properties: + compatible: + contains: + enum: + - qcom,sc8280xp-qmp-usb3-uni-phy + then: + properties: + clocks: + maxItems: 4 + clock-names: + items: + - const: aux + - const: ref + - const: com_aux + - const: pipe + + - if: + properties: + compatible: + contains: + enum: + - qcom,qcm2290-qmp-usb3-phy + - qcom,sm6115-qmp-usb3-phy + then: + patternProperties: + "^phy@[0-9a-f]+$": + properties: + reg: + items: + - description: TX lane 1 + - description: RX lane 1 + - description: PCS + - description: TX lane 2 + - description: RX lane 2 + - description: PCS_MISC + examples: - | #include From patchwork Fri Apr 7 06:11:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 671815 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 9368CC76196 for ; Fri, 7 Apr 2023 06:11:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237444AbjDGGLw (ORCPT ); Fri, 7 Apr 2023 02:11:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233324AbjDGGLt (ORCPT ); Fri, 7 Apr 2023 02:11:49 -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 E4363A5EC for ; Thu, 6 Apr 2023 23:11:43 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-62609d98b78so105112b3a.0 for ; Thu, 06 Apr 2023 23:11:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680847903; 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=211/WQndq/0dIl4SBYP+HR+YcyINuvXrDMq+d+OBMX0=; b=lIm2dOTV1ZyuKjez2fSI0LPbQVa4KKfwrbjvSJegqX/etzx4+UuDyt4VMVUuOmqXZh eYtKJ+tY+5EnH4q3WvFr6YsnG8hZSVYA6dcUENfbDukd1+PtsFY/TNQcfNZ9UJbMCZXl H04QxaDhreuEVjVgjrtUzMMZSt99NE62IDD+POwPQlMk9DG2GNkiqqP2OIHoL1GQtYGq lFYdHzjq2xjmwm2W+GTP90JFxWBTZdTFil+23TQkZQEcf4+hRvuaUSarLliAGVn0GAhW RRyej4c0zdtxcSmzg1+mGRxqgVw6SqBgxvHLB9AhqWbYs2g0907aEOvPnzGG51nNo005 I2ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680847903; 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=211/WQndq/0dIl4SBYP+HR+YcyINuvXrDMq+d+OBMX0=; b=4TQRq06X10iKYjySCQOzjI2bOkDahGWO6c6cwryZ/fO31q8zSLkYgarFGAbE1j/cnl 1w6fWGqNTqj+8nDDF7wyDqQgNFEJCaDF3Tfgtq2/Ccl5dzC2tLiIHWfdZvoDc78NIfu2 36T0k3ODOIuptM3y/malJMmjZJsQ2Xo5EDVCyCf86xULlpEeftMz9PJ2jhM124klB3ER 8xduQXg81UUIVhMuR3Newes9jz+RSFA1kRZSjylcwZis+tIzNXKDyi2vpqZwcDxM5XTj Dj7UdWv8JfCQYeVz0JVK3hf+5rqOwsLL8zThtq3Ys1Ovx6G4T8w9sNg83xot+brNe6yQ K0qg== X-Gm-Message-State: AAQBX9cacaORHWTU8vtcaKWP5N/lWShgtz8s+hVugkaeKWRAq3HpQUJc zrv0uwdu/UQfJ35y0b9gKME5xQ== X-Google-Smtp-Source: AKy350bzkyU/L95q1La6S7UbwY2cS2FuyGPLUXtdRiLUdUhCCWKIm6ciLc7IhgzxzDKXjvMjwoFsBQ== X-Received: by 2002:a62:7b50:0:b0:62a:5769:25f9 with SMTP id w77-20020a627b50000000b0062a576925f9mr1420730pfc.28.1680847903256; Thu, 06 Apr 2023 23:11:43 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:1c60:6a11:8ba1:beba:def7:a4ae]) by smtp.gmail.com with ESMTPSA id u25-20020aa78399000000b0062d7e9bb17asm2253879pfm.81.2023.04.06.23.11.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 23:11:42 -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 v6 2/2] arm64: dts: qcom: sm6115: Add USB SS qmp phy node Date: Fri, 7 Apr 2023 11:41:22 +0530 Message-Id: <20230407061122.2036838-3-bhupesh.sharma@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230407061122.2036838-1-bhupesh.sharma@linaro.org> References: <20230407061122.2036838-1-bhupesh.sharma@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@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 2505c815c65a..f42065a0a71d 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -651,6 +651,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_USB3_PHY_PRIM_SP0_BCR>, + <&gcc GCC_USB3PHY_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>; @@ -1101,8 +1133,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 {