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: 80664 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp83289vqo; Thu, 6 Apr 2023 23:21:47 -0700 (PDT) X-Google-Smtp-Source: AKy350b+3lClr232iKruVNzLd+T+rb2dUlFOFn0w98rt8LiqPJIvWD3ctR8NcWJ0a0Vci7WFaLGR X-Received: by 2002:a17:906:f74c:b0:933:15c0:6e05 with SMTP id jp12-20020a170906f74c00b0093315c06e05mr1310610ejb.7.1680848506860; Thu, 06 Apr 2023 23:21:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680848506; cv=none; d=google.com; s=arc-20160816; b=mAuRH9aIeYzmgRD9nw/rY1lPktrqpYXrFtp5lwnss3M3byR/X2JHu2wsl/KTeq3+pv 10/0DY6VJa/ya+0ml1NJbhmbt8IEiwAutTAs1YbGU5MRPYz9TIZurJBjG8WEWKMv5pMc u4SK+K5tNaWzy3lFD513t8MMB0w1dx43Rr4CQUW5uqUHwm5gUIZeqbeTU3avf5ogQMXn zt+CiQLjmzylV7lBylDtmGQj+93vYAgIBxclkEklxzTSG3XxCwXZ8Ny1NZKl2yjpIR+s eroq6QjOn9PggQMgoAQVTHyBTf3ARyMzg/zGbNnQxomgSmoj+ZeK3b14tTK4l2U139R5 cQqQ== 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=wsyeQXy2xW6CfVtCD6z7F80PD3154E+msxA/B8ME+4s=; b=kvlz/dHYHbuJVhpXsUa+X7Mw9aWCZdJD/99UKc1UoEsDHzu9zQcvVQ5jSqCunEqEah RG2XosJ0cz43LyrGg57kLWNEaQ6SrsAOYRISb72PsiYlTxudRYfZmxUN75Kr+b0UA2Mq i7FJkPhpqP6OijNsVeXmzIBOC+ydOv+NdPqGp5BqH4f1r69OOdSC9VsBcYnmKC1KaIT4 L97QPJngegdrYlZw3Sx3QCmDxM1ImsuI+XwDyAmNPFsmnq34UK0ByK9ArL6ni04MT4Hp 1lWmmZpKLf1WzQcFMdJlfjghxQnLUVNObFdfMmf0ypRVJVILs2defoHc49lq/pwnYl2Q GexA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TxaHigEq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z2-20020a1709060be200b0092bfbe8e4adsi747564ejg.238.2023.04.06.23.21.22; Thu, 06 Apr 2023 23:21:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TxaHigEq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S231642AbjDGGLp (ORCPT + 99 others); Fri, 7 Apr 2023 02:11:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232887AbjDGGLk (ORCPT ); Fri, 7 Apr 2023 02:11:40 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0488F10A for ; Thu, 6 Apr 2023 23:11:39 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-23cfbaef575so38631a91.3 for ; Thu, 06 Apr 2023 23:11:38 -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=7uhIWOj+HJMJ/lHjH1pyN2D9vPxE0XGa9vatLIiobhvRMzrqIe1PyxxQ65nFLxmn00 v1G++tOU3JP1MtbWmTuQE1lhjp7Qs6J4FlmoNvqQ/D1LPia8SU8j5geF1ZlN6bK8ujxQ odUYsog/EMVywsPXd/2C15J6jAQcpwNDptmZeYMNRog9d1KvMZRZ5h/Bg4gvC/DeYCpM sE1jgW9T5x0tSEOIlK11p7iSvfEdfnvwejGQ8Xy+AfALx1a2aIBjtI/xUjG1j0SSqT8V hQX2dTmuorCmJ63bGgjJ4EtBR+mZohU2NUB6+KmKMJqT9sb7zF3qaN+LA1yeUoUfEAYA ueWw== X-Gm-Message-State: AAQBX9fTOL0DZXQOWAMjYbKOukvihNp6EMuGafeBOnUSvZWmZPFK4JBu nkLbCjj8PurR+O6JHA6s1qdpvTLGRIbWCPZTLIM= 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 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762497403567047965?= X-GMAIL-MSGID: =?utf-8?q?1762497403567047965?= '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: 80665 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp83685vqo; Thu, 6 Apr 2023 23:22:50 -0700 (PDT) X-Google-Smtp-Source: AKy350ZXNaZiwjj52ShUHz3yU8EYRs8Ggdk3Sfl7U2rfMlwl9v7imuXbvvgZMgDNG8yMRqkNJTqt X-Received: by 2002:a17:906:cf84:b0:93d:b767:9fea with SMTP id um4-20020a170906cf8400b0093db7679feamr1133261ejb.31.1680848570152; Thu, 06 Apr 2023 23:22:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680848570; cv=none; d=google.com; s=arc-20160816; b=K8wdjXYUEXZs0AD+FFLbIXzw+TTHCjpGjC17D5Lw8OAx7eiUzyWsUp3S0AS/YCdXQ3 F20IvsPR+ODEMw6PHeOCc5VHVoFNHqLe9SjMThSVy2puUFaQAsNHeAMWIIVNhG4pNssj 3wZU7gyM1WfRTuNq73/pzxU17RQ1oOTKa4NIh79HsMruhI47gE2u4FZ8HK78QJrOCRVM 2COFzsmXCsuilJuTJgAL4RrmoteODALCa6qOrZfhFLN+IR3pannYVu2/FKvMxUow0pUT ZfwCi+s+ph+8DxaNKKCAjT0z7yt3j8OLZ9GcA5Q0Qnr167iTB5t/l2+69xiQuW2OVC8Y A+uw== 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=211/WQndq/0dIl4SBYP+HR+YcyINuvXrDMq+d+OBMX0=; b=h6FgpxDvdOQaHCJKZN1i8FEg0n09x2uoEt87aFCMM4P3sqR4hXAdfw43KvHJkzxLVP KdsBfd33IAdhwWeknRpFtAV9yWTaptasyg7YmJqx6+rCXPWosqN+GHgV5NZqnoa4vKI/ g3O+zFZgjNEBOdhzilf0f4tme7d4BkRvZ2hoozXGORSPXhQvUh7Qo3Jz35A6Vfegze2q Y/O4as9pyWbWV0yGqfszeuOS0Xc7DSDtFRSrkIR8ipC+Xmx9TOFNsS7IJ8KlclFGvfFv iLMnyA7sdIGImaL3zwOhubUUPsQwdT1Souxf8KKX9/v3qGPb7ZyzmtfPZLmb+EbDGaBQ 3bbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lIm2dOTV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cf19-20020a170906b2d300b009326c8764d5si2183647ejb.424.2023.04.06.23.22.25; Thu, 06 Apr 2023 23:22:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lIm2dOTV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S236860AbjDGGLw (ORCPT + 99 others); Fri, 7 Apr 2023 02:11:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233479AbjDGGLr (ORCPT ); Fri, 7 Apr 2023 02:11:47 -0400 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E13CD9EF9 for ; Thu, 6 Apr 2023 23:11:43 -0700 (PDT) Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1a4fe31ee82so267225ad.2 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=3GF1K9AcU8EBpAm+q8viSlntPb679Ak25S0SCuklbvL96fFbh6fAqwVaXDV/y4O8V8 B0ynYhjLOjtGKeARtU+MhmBzEpysLUzrtTW1+NJj9/tjbbJ+TBTWE6Lmfl4Kmu4QwBm8 ECGsxQy+vcsUgXvqsyN5nAzMOb4zVeGB3zQEoT9h4J3SS3UCEDKtCPI8mnzYdJI6J999 HRh6elz2zeULab339UKFzm1DtegqeObIWDXodjU+AWypQj5BI1J6kQtGO6k8HYchkDfI OiwdHGWOans6d0HKAYBxpAKVQl/OIitqKqrdwvauddwjJWC1tpi5dzEs1hXALgCoOxmt 2qPw== X-Gm-Message-State: AAQBX9fEdDEcPpnuNTppSwfwCGaYX/FbDJmsgwjrPfP2F9YCww4PzVfq MUX93pwDYnGqBSKs+Bla1b1fKQ== 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 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762497470378284888?= X-GMAIL-MSGID: =?utf-8?q?1762497470378284888?= 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 {