From patchwork Sun May 21 20:38:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 684550 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 2C1FFC7EE30 for ; Sun, 21 May 2023 20:38:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229558AbjEUUil (ORCPT ); Sun, 21 May 2023 16:38:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230083AbjEUUik (ORCPT ); Sun, 21 May 2023 16:38:40 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C388BDE for ; Sun, 21 May 2023 13:38:38 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4f3b9755961so1263106e87.0 for ; Sun, 21 May 2023 13:38:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684701517; x=1687293517; 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=I68K3BB4iJfx3Xn7rbtjuQH5W+UC/hortCKGNEq34Zo=; b=pj01oD/DhA4/PgO4feLJ8t9ehDOMDF2InPTck84lY5WdhFPA8dFrZ/0ZwtlIAfDSjo mqftDUnLAWtwLc03DikoKEJwHtpN8uHlV3AG1YNFrFhjnNwnrGua0dC/WYiQ4BvLwp1X zriZ3ePEj7338L1BODdoIY0T/530dQGyrKpPfVLFy9Eco0CbF1oZiloeo2l8iG7qVURP Mmm0NPimncaMGDJhA32BYjTzQlw8TJxGhqLuSAZySBpn04KAnO0Ul2Uv0x34d8Ja5IzY I+zHK4sAEIMe7l6focLM82i9Zr7tc/gpUeyjWT9HzhcIqcoBofD/dRjnl8xK7D/CYoqv IlyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684701517; x=1687293517; 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=I68K3BB4iJfx3Xn7rbtjuQH5W+UC/hortCKGNEq34Zo=; b=c5nh0XoPH3jjLYD30HTsQvNA85OyXGqZP6paIY8yDmYh2JDMdDFr+SnVKByd1zbJco AxBnGC8ZQGwR1M3OR9mhjO9bwV80pnw1ONW8XYTUCrVB1oaodmHFK0WZa6H2mDWV1QjD tY6pv/4jpTWWzDUX8Qwp+/BvNiwZwILrb/NeSmwc+sujExuqvmJtOEvCeQb8g5t1zM+F rhAOJYfJdq2kln7WVHMFtroQbE/8GZSn7qWL9qvpgnOfuGFeVn3KORZjm6Ljq4gLd6Kv ovc8X3j3vp2kRgbjDNuzdlr4bx3xjmORyctBrZUllKXxLUvd0JA7xRk0QMOqEGFGPMKx mUxw== X-Gm-Message-State: AC+VfDxHu4tQC60+qizmzYP/3xcO1SpXZZke8n4zT43LWEvccDgvc22w WSRoF2c0vTZ0nRZrmqFWgzxXXw== X-Google-Smtp-Source: ACHHUZ5hmXRPSqTfhQ9vTSq3nxEv2YfyIpbFxNUWDGxjmKUkje/zdKG3uQ4BUNrsBSYS4rZq2NX4tQ== X-Received: by 2002:a05:6512:489:b0:4ec:9e40:e445 with SMTP id v9-20020a056512048900b004ec9e40e445mr2666873lfq.19.1684701517021; Sun, 21 May 2023 13:38:37 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id a15-20020a056512020f00b004f3886a63d1sm718894lfo.298.2023.05.21.13.38.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 13:38:36 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski Cc: Philipp Zabel , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, Johan Hovold Subject: [PATCH v2 02/11] phy: qcom-qmp-ufs: populate offsets configuration Date: Sun, 21 May 2023 23:38:25 +0300 Message-Id: <20230521203834.22566-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230521203834.22566-1-dmitry.baryshkov@linaro.org> References: <20230521203834.22566-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Populate offsets configuration for the rest of UFS PHYs to make it possible to switch them to the new (single-node) bindings style. Signed-off-by: Dmitry Baryshkov --- drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c index 8c877b668bb9..d99dc1043f74 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c @@ -833,6 +833,8 @@ static const struct qmp_ufs_offsets qmp_ufs_offsets_v6 = { static const struct qmp_phy_cfg msm8996_ufsphy_cfg = { .lanes = 1, + .offsets = &qmp_ufs_offsets, + .tbls = { .serdes = msm8996_ufsphy_serdes, .serdes_num = ARRAY_SIZE(msm8996_ufsphy_serdes), @@ -924,6 +926,8 @@ static const struct qmp_phy_cfg sc8280xp_ufsphy_cfg = { static const struct qmp_phy_cfg sdm845_ufsphy_cfg = { .lanes = 2, + .offsets = &qmp_ufs_offsets, + .tbls = { .serdes = sdm845_ufsphy_serdes, .serdes_num = ARRAY_SIZE(sdm845_ufsphy_serdes), @@ -1038,6 +1042,8 @@ static const struct qmp_phy_cfg sm8150_ufsphy_cfg = { static const struct qmp_phy_cfg sm8250_ufsphy_cfg = { .lanes = 2, + .offsets = &qmp_ufs_offsets, + .tbls = { .serdes = sm8150_ufsphy_serdes, .serdes_num = ARRAY_SIZE(sm8150_ufsphy_serdes), @@ -1070,6 +1076,8 @@ static const struct qmp_phy_cfg sm8250_ufsphy_cfg = { static const struct qmp_phy_cfg sm8350_ufsphy_cfg = { .lanes = 2, + .offsets = &qmp_ufs_offsets, + .tbls = { .serdes = sm8350_ufsphy_serdes, .serdes_num = ARRAY_SIZE(sm8350_ufsphy_serdes), @@ -1102,6 +1110,8 @@ static const struct qmp_phy_cfg sm8350_ufsphy_cfg = { static const struct qmp_phy_cfg sm8450_ufsphy_cfg = { .lanes = 2, + .offsets = &qmp_ufs_offsets, + .tbls = { .serdes = sm8350_ufsphy_serdes, .serdes_num = ARRAY_SIZE(sm8350_ufsphy_serdes), From patchwork Sun May 21 20:38:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 684551 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 541A5C7EE32 for ; Sun, 21 May 2023 20:38:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230083AbjEUUil (ORCPT ); Sun, 21 May 2023 16:38:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230176AbjEUUik (ORCPT ); Sun, 21 May 2023 16:38:40 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67A61E4 for ; Sun, 21 May 2023 13:38:39 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-4f3af4295ddso2731998e87.2 for ; Sun, 21 May 2023 13:38:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684701517; x=1687293517; 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=qEd5aRZcblmvyovy6XBo3UP3UrwNyl766kcTf3FoCzI=; b=GPdfXU9BGMlDbOLV3VTQgyLenO9bA/6TjNpbelheLDfE2YzD0Nz0n8NDS3TWBQdesb yRw/9lYJKCwW2xz3XDUxhh7A5R4ZsaF8a0C/q4qz4pzbFCW5hL9nBcbqSbTaIkpUoRQP 2i5HaNG9SFojW3ytTA+soiLiWusyXL00JzXw+B+QqaCo10mkYZ3z8nEyS3qDN+q2Yj4l IyIMVbjLZf8Pjju4EYbH+RkGZibDRB3QophkljWnaGwf245DOojwSddFzQ7uoP39+VVd Z68vwo2ljFTgbN6X6UMNyIMS7ux49d4o3oY/5/n3l1Mo8flFNHHDlr7YOBkCPEG7S17Z ts3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684701517; x=1687293517; 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=qEd5aRZcblmvyovy6XBo3UP3UrwNyl766kcTf3FoCzI=; b=VrsJL3LBi/hQaV0zN113ibkJG/l3w0DdVod7IFQ5K/OpUjjcGLJMeOTO5dI+2z0GGU 03tRnm+XkmF2NUBvgafPMeRBQ8uf2/eVo3re6FK4cOw+ou99GfveojDaebNpCRMb/2b4 WaMhB0WtEcmAlcGbi0cGEqFK9zVLZamigsY2h/jieQ3ZJ7ldOvrxO31AOYU2B+85x7QH nNnFnLNAHK67IN4oDcGkTNItUEXD6/6G3IjKCDSq25gy3a9drfIvvKm8h1eYzcVZG+fm zGs4c3pjegVw8APcYTPMDv1LkZhIgNhoCoyAtU7l11NXI4CbOCtcA/TLL3AAeMukpaKn rK5A== X-Gm-Message-State: AC+VfDyR25QJZy3+mU4pIIZZsHi9XtV851QwVKdvnHP9FHR/0GDgc+rg XcAlJcOQhJxjO+S/zpJmu0PDzA== X-Google-Smtp-Source: ACHHUZ6JujLJRMd05D4SiIm/3GUQkEmlQknMso9xKifylodq08Hvw+PdAvGUOWVMvDbOg+NT3G8skg== X-Received: by 2002:ac2:5217:0:b0:4f1:4051:d77b with SMTP id a23-20020ac25217000000b004f14051d77bmr2854849lfl.60.1684701517791; Sun, 21 May 2023 13:38:37 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id a15-20020a056512020f00b004f3886a63d1sm718894lfo.298.2023.05.21.13.38.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 13:38:37 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski Cc: Philipp Zabel , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, Johan Hovold Subject: [PATCH v2 03/11] arm64: dts: qcom: msm8996: switch UFS QMP PHY to new style of bindings Date: Sun, 21 May 2023 23:38:26 +0300 Message-Id: <20230521203834.22566-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230521203834.22566-1-dmitry.baryshkov@linaro.org> References: <20230521203834.22566-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Change the UFS QMP PHY to use newer style of QMP PHY bindings (single resource region, no per-PHY subnodes). Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 2b35cb3f5292..2b65c608a57e 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -726,9 +726,9 @@ gcc: clock-controller@300000 { <&pciephy_1>, <&pciephy_2>, <&ssusb_phy_0>, - <&ufsphy_lane 0>, - <&ufsphy_lane 1>, - <&ufsphy_lane 2>; + <&ufsphy 0>, + <&ufsphy 1>, + <&ufsphy 2>; clock-names = "cxo", "cxo2", "sleep_clk", @@ -1993,7 +1993,7 @@ ufshc: ufshc@624000 { reg = <0x00624000 0x2500>; interrupts = ; - phys = <&ufsphy_lane>; + phys = <&ufsphy>; phy-names = "ufsphy"; power-domains = <&gcc UFS_GDSC>; @@ -2046,25 +2046,18 @@ ufshc: ufshc@624000 { ufsphy: phy@627000 { compatible = "qcom,msm8996-qmp-ufs-phy"; - reg = <0x00627000 0x1c4>; - #address-cells = <1>; - #size-cells = <1>; - ranges; + reg = <0x00627000 0x1000>; clocks = <&gcc GCC_UFS_CLKREF_CLK>; clock-names = "ref"; resets = <&ufshc 0>; reset-names = "ufsphy"; - status = "disabled"; - ufsphy_lane: phy@627400 { - reg = <0x627400 0x12c>, - <0x627600 0x200>, - <0x627c00 0x1b4>; - #clock-cells = <1>; - #phy-cells = <0>; - }; + #clock-cells = <1>; + #phy-cells = <0>; + + status = "disabled"; }; camss: camss@a00000 { From patchwork Sun May 21 20:38:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 684549 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 06D35C7EE33 for ; Sun, 21 May 2023 20:38:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231164AbjEUUin (ORCPT ); Sun, 21 May 2023 16:38:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230450AbjEUUim (ORCPT ); Sun, 21 May 2023 16:38:42 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E217CDE for ; Sun, 21 May 2023 13:38:40 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-4eed764a10cso5800557e87.0 for ; Sun, 21 May 2023 13:38:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684701519; x=1687293519; 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=KYaAz3NVZWe0zOO/EfhBaHEvvJ4Fl+YGXj48Osn7Edo=; b=sR7CHc9NFCL6xeWYvz+Y/xARXTFWUKTj3HWQ/7hfvv7JM2K483X3rZJZgT46aS8ueY Rk1TH0YBGD6ShGtxO9H0oppbeiBL3TfvuAecJwze1GT5QLoTpynprC9hEg0jCcBDaB6i CoHB4gIFP37+DtsviszsHyo1RX7NxDZCS3cpcu488XdU6fo4lR5DWlAMFn5socxPt7GA /4I7m+vVq8al+wGkzj86+3IQjvHTcM88AkxwLf5ceUybh+nfPpyRz4jGYwktx7gbA8NN J52vYt/lFdN2c0MvOqHCKlUr53tXTHAaN/j3ip0rAXfeVgthtet4MldbVyGy76fBG3O6 dMMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684701519; x=1687293519; 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=KYaAz3NVZWe0zOO/EfhBaHEvvJ4Fl+YGXj48Osn7Edo=; b=L/aWSCAHw7Hrv7Vxviecf3/rJsQsXQTN6Y1gWtLygiSoW+rk6L3G6RWnZMdoSOdRMf TrT9I+ztAg98QtN6S3ehd0jwgESjqrZMVk8BAKPatlBciSfEUcjFtEZODZUkVvshUpV7 pKyAEisLsO9jSLDRXrJE4ePFv3NpNR9IUHtqLHe5V+PHLetqqBOel0SSMkgzCkwe/JTC 9tRJ065Y9QUnq5GvGYvTPI+vAUIYRUuGfV1h1cuOkE+G4HbZ/tza6ZkJmRImrSevwNKS isdE/PrMX4ZYPBalK2FYBqqrj2NKsVSIzzL4IJp1OBitNDsI8tviTvnpC0VFZzLxAEcz 4Y1Q== X-Gm-Message-State: AC+VfDxC0squExEtEAqbGQK96P6Wlvyt4yJkZ1sn3TmM6CX6ftM6A7ph vHryt1TFIPOFlQnc4Vz+BTUx/g== X-Google-Smtp-Source: ACHHUZ6C8tWgxOGHMTlmqENwZasL+xWlLoCLFxFuVI754CJdE5URzzYz07ox43u2xCQDq9JfhZNXfg== X-Received: by 2002:a05:6512:376b:b0:4ef:f4ef:a1cc with SMTP id z11-20020a056512376b00b004eff4efa1ccmr2289426lft.14.1684701519210; Sun, 21 May 2023 13:38:39 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id a15-20020a056512020f00b004f3886a63d1sm718894lfo.298.2023.05.21.13.38.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 13:38:38 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski Cc: Philipp Zabel , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, Johan Hovold Subject: [PATCH v2 05/11] arm64: dts: qcom: sdm845: switch UFS QMP PHY to new style of bindings Date: Sun, 21 May 2023 23:38:28 +0300 Message-Id: <20230521203834.22566-6-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230521203834.22566-1-dmitry.baryshkov@linaro.org> References: <20230521203834.22566-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Change the UFS QMP PHY to use newer style of QMP PHY bindings (single resource region, no per-PHY subnodes). Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 6aa2f8f3affc..559a50c44da1 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -2566,7 +2566,7 @@ ufs_mem_hc: ufshc@1d84000 { <0 0x01d90000 0 0x8000>; reg-names = "std", "ice"; interrupts = ; - phys = <&ufs_mem_phy_lanes>; + phys = <&ufs_mem_phy>; phy-names = "ufsphy"; lanes-per-direction = <2>; power-domains = <&gcc UFS_PHY_GDSC>; @@ -2612,10 +2612,8 @@ ufs_mem_hc: ufshc@1d84000 { ufs_mem_phy: phy@1d87000 { compatible = "qcom,sdm845-qmp-ufs-phy"; - reg = <0 0x01d87000 0 0x18c>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + reg = <0 0x01d87000 0 0x1000>; + clock-names = "ref", "ref_aux"; clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, @@ -2625,14 +2623,7 @@ ufs_mem_phy: phy@1d87000 { reset-names = "ufsphy"; status = "disabled"; - ufs_mem_phy_lanes: phy@1d87400 { - reg = <0 0x01d87400 0 0x108>, - <0 0x01d87600 0 0x1e0>, - <0 0x01d87c00 0 0x1dc>, - <0 0x01d87800 0 0x108>, - <0 0x01d87a00 0 0x1e0>; - #phy-cells = <0>; - }; + #phy-cells = <0>; }; cryptobam: dma-controller@1dc4000 { From patchwork Sun May 21 20:38:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 684548 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 32433C7EE26 for ; Sun, 21 May 2023 20:38:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230381AbjEUUip (ORCPT ); Sun, 21 May 2023 16:38:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231161AbjEUUin (ORCPT ); Sun, 21 May 2023 16:38:43 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2825E6 for ; Sun, 21 May 2023 13:38:41 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-4f3af4295ddso2732031e87.2 for ; Sun, 21 May 2023 13:38:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684701521; x=1687293521; 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=6Kd0Grqe79UZr596KesxYlHc6g9tfq6ax8GIQassp/A=; b=rxwteexP+1nh6CjONIZr5CpVVFrMfvmp1jO6T8LthurqFa/1msDZ5g/8CDZHX9ysh2 zsJ0Exm/Pe6SyyKSjSrdJZVVitQCfZGoboVC/9inP693w47iZAYjJXFUimeF/t1F3Wlj W0S+nbNPn2IJv28N4YcGKdZbr3Z6cHbs9s6EZvy9nBgXTXnVrk4+dw01cpQIW7rkSETJ ZxufG8BpzKu0VCjwQ4FRgnJHYuHAOPHbch58CiwvTpARj2C1xsQNz+GUMkLQ0DtHbKua kMcX0XciDaVoXxq/V82P1VB8ocJ3A0qbOIXbKMLS6YQZcxccycNwB9YghASuUIq7b/qX qg7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684701521; x=1687293521; 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=6Kd0Grqe79UZr596KesxYlHc6g9tfq6ax8GIQassp/A=; b=HZM3LdI/n7dA8g7MTyLoK2ris/k9UvpTE2nvsjVCcvK/ni7U8xN2PgjxvLu2wuY7uk pazp3oiEHz3c5WkKhg4QzvRImy9/QGaDLqNa0kjkPN80SXDa+RK/qbVVQU2+xd/+EKGi VIEkRj3aQRFT5p4Yevwyj1T5wVSHFZqiECEV/3D2Gsp6S4f0wH9OPfMjvgx5p9xtPiuM zfNciBJ731Uq692D8Sh7miBp0W4jjeuT0SPKUFfeMMKZZcwkhbUZ92bonjhmDZAuW8dJ TL45VjXZJ7nEDmOh6Rpxl+FK3e3L2MX6j+2osqm5ZiIvZt8UpC5XnXspRV+KleHS6GHC kKxA== X-Gm-Message-State: AC+VfDyYKJgXPRbGh5J8sOAnHwTf2QFGY6v+yjBpZj+MswBONsyL2uIu sV7RnV34ecGCZed8h4hsbZxFIQ== X-Google-Smtp-Source: ACHHUZ4XLF3qbBUiVvvYU3ykQWv79zMtchpy1NLZ2gOLLFNpRC22jZoi5ayM3bowdGVsfAq8TwhW8Q== X-Received: by 2002:ac2:5581:0:b0:4d8:8ad1:a05f with SMTP id v1-20020ac25581000000b004d88ad1a05fmr2820050lfg.48.1684701521550; Sun, 21 May 2023 13:38:41 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id a15-20020a056512020f00b004f3886a63d1sm718894lfo.298.2023.05.21.13.38.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 13:38:41 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski Cc: Philipp Zabel , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, Johan Hovold Subject: [PATCH v2 08/11] arm64: dts: qcom: sm8150: switch UFS QMP PHY to new style of bindings Date: Sun, 21 May 2023 23:38:31 +0300 Message-Id: <20230521203834.22566-9-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230521203834.22566-1-dmitry.baryshkov@linaro.org> References: <20230521203834.22566-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Change the UFS QMP PHY to use newer style of QMP PHY bindings (single resource region, no per-PHY subnodes). Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sm8150.dtsi | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index e2e210e10475..98fd356e87e4 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -2019,7 +2019,7 @@ ufs_mem_hc: ufshc@1d84000 { <0 0x01d90000 0 0x8000>; reg-names = "std", "ice"; interrupts = ; - phys = <&ufs_mem_phy_lanes>; + phys = <&ufs_mem_phy>; phy-names = "ufsphy"; lanes-per-direction = <2>; #reset-cells = <1>; @@ -2064,10 +2064,8 @@ ufs_mem_hc: ufshc@1d84000 { ufs_mem_phy: phy@1d87000 { compatible = "qcom,sm8150-qmp-ufs-phy"; - reg = <0 0x01d87000 0 0x1c0>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + reg = <0 0x01d87000 0 0x1000>; + clock-names = "ref", "ref_aux"; clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, @@ -2077,16 +2075,10 @@ ufs_mem_phy: phy@1d87000 { resets = <&ufs_mem_hc 0>; reset-names = "ufsphy"; - status = "disabled"; - ufs_mem_phy_lanes: phy@1d87400 { - reg = <0 0x01d87400 0 0x16c>, - <0 0x01d87600 0 0x200>, - <0 0x01d87c00 0 0x200>, - <0 0x01d87800 0 0x16c>, - <0 0x01d87a00 0 0x200>; - #phy-cells = <0>; - }; + #phy-cells = <0>; + + status = "disabled"; }; tcsr_mutex: hwlock@1f40000 { From patchwork Sun May 21 20:38:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 684547 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 DFE98C7EE23 for ; Sun, 21 May 2023 20:38:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230416AbjEUUis (ORCPT ); Sun, 21 May 2023 16:38:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231178AbjEUUip (ORCPT ); Sun, 21 May 2023 16:38:45 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E957DE9 for ; Sun, 21 May 2023 13:38:43 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-4f4b2bc1565so21726e87.2 for ; Sun, 21 May 2023 13:38:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684701522; x=1687293522; 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=TRJBo2K4JrjwLhHiK/ZocJWB2xdutU+lTQFD8QMjoGA=; b=KaypcyySOVmVu9LX0Ib3kZDV1gj2Zlz/g1TvDO1Af01uo0XwfurMgfRPpHdigfhcHp USTtQ2zgyTfDIJGN6P7NSn2n2SD4ZVsOfTbM0Nk2OMq9UfXgoMHaHM9EEIcGnDY80dlW dcHeCXJ/pKXGZjHzXBg+YxxpDlUWwY35SsJ/MbnSbbbOdahKmsgWKYtbwpdeRdx5Lp10 Zs/lqJXlTO2YZBmhP5AYtoaLvDVj6C9WeXUfLvN40LGfzA0NQnYNXhXCC1TgrPsluZPH JPEcs03R4XPb1kei1ihUlKYGopLDGUdWDhysMIjJAFd8Y4jN4BzDPZ1Eeb/2g4fB/tFg GDbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684701522; x=1687293522; 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=TRJBo2K4JrjwLhHiK/ZocJWB2xdutU+lTQFD8QMjoGA=; b=kibRiyEXg/XKPxhlFDYoNSjtq/7fHsk6UZZa8VnSbhrHVbbYJjWeIuXOK9d6L4ip+E JCwb50+xvDpZOrNPwdRua+jEp/1yuIdpLW9mwaDlHx3ZDMRS4h+Qnw3qbuMu8GneD06R myG7wDCd36V0VUHbaz/pvdHDi4LkTZyI4KpDvQD0qDlv1gaCQPL4q7V3Tx4uxbUm9FsK 0b+UQYN9Iud3PQJDYQIscW2mXI456GGCJ4ocun1LEYx4AL7C61bvAAy3nyxN6lZAY8ZM oBJcV/qjejZg1gV/UTp3+dH6jR594icT9XLGE5pGbTu4MznP/QHCp3ojF6VhvJ1GFtM+ aTKw== X-Gm-Message-State: AC+VfDxpwNjkP9KA1yxJhFAE0ACvucYwBbQIJgB7Qh8vLFj5j+GQBgS+ h9HeveOq7d4yI2bp5GbwKp1cV+zEB0Pm/1nJ47A= X-Google-Smtp-Source: ACHHUZ7a5bgCFlOpWk96ZeN+JJFoBpRjZPh/JTzfwA1mKlRn9YhFDlaVw2EpcKcbcvFScudkOlE7aA== X-Received: by 2002:a05:6512:3c9:b0:4ee:dafa:cb00 with SMTP id w9-20020a05651203c900b004eedafacb00mr2919192lfp.60.1684701522242; Sun, 21 May 2023 13:38:42 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id a15-20020a056512020f00b004f3886a63d1sm718894lfo.298.2023.05.21.13.38.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 13:38:41 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski Cc: Philipp Zabel , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, Johan Hovold Subject: [PATCH v2 09/11] arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings Date: Sun, 21 May 2023 23:38:32 +0300 Message-Id: <20230521203834.22566-10-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230521203834.22566-1-dmitry.baryshkov@linaro.org> References: <20230521203834.22566-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Change the UFS QMP PHY to use newer style of QMP PHY bindings (single resource region, no per-PHY subnodes). Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index a260e4a7305b..4e94fb3bd0bc 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -2166,7 +2166,7 @@ ufs_mem_hc: ufshc@1d84000 { "jedec,ufs-2.0"; reg = <0 0x01d84000 0 0x3000>; interrupts = ; - phys = <&ufs_mem_phy_lanes>; + phys = <&ufs_mem_phy>; phy-names = "ufsphy"; lanes-per-direction = <2>; #reset-cells = <1>; @@ -2210,10 +2210,8 @@ ufs_mem_hc: ufshc@1d84000 { ufs_mem_phy: phy@1d87000 { compatible = "qcom,sm8250-qmp-ufs-phy"; - reg = <0 0x01d87000 0 0x1c0>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + reg = <0 0x01d87000 0 0x1000>; + clock-names = "ref", "ref_aux"; clocks = <&rpmhcc RPMH_CXO_CLK>, @@ -2221,16 +2219,10 @@ ufs_mem_phy: phy@1d87000 { resets = <&ufs_mem_hc 0>; reset-names = "ufsphy"; - status = "disabled"; - ufs_mem_phy_lanes: phy@1d87400 { - reg = <0 0x01d87400 0 0x16c>, - <0 0x01d87600 0 0x200>, - <0 0x01d87c00 0 0x200>, - <0 0x01d87800 0 0x16c>, - <0 0x01d87a00 0 0x200>; - #phy-cells = <0>; - }; + #phy-cells = <0>; + + status = "disabled"; }; tcsr_mutex: hwlock@1f40000 { From patchwork Sun May 21 20:38:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 684546 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 0C85AC7EE2F for ; Sun, 21 May 2023 20:38:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231178AbjEUUiu (ORCPT ); Sun, 21 May 2023 16:38:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231189AbjEUUiq (ORCPT ); Sun, 21 May 2023 16:38:46 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2739E3 for ; Sun, 21 May 2023 13:38:44 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-4f3a9ad31dbso3813834e87.0 for ; Sun, 21 May 2023 13:38:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684701523; x=1687293523; 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=/UZaHZEJviemE81XyTdp/8utctQbN84VrZL5H97wJ0Y=; b=x5SaxrdZ8QS4LHChbsiW5FpNhdo+M4eY2zabzjP9EpZ9Zcf5Tj3cYNPbWRJRxYAHpG O1JxJgwXp6Iea5a8/jF+tMrzao0NlgWeuazqGWR2q9tIVlCY/myrMfXa5153Ub13znNJ 356l7r8m6Ml9Xoco0X7ngTeHrSe6FgaQ7UpNPkZOolN9Gk8SD3zl2iA/viW/+5EUMdjR 3JGfethlq7yjvo0LWaenltg2Vj6uprheFgrDNQ2KVbF59lY1BbcHOQTLeENOd3V0lN2p 7TxCgGOpljvqmKrkKUflVgEkQXXnK7N60WhiCugw0gH9/3T35b+ALS6jkDRjKRQ48Utd 2Kag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684701523; x=1687293523; 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=/UZaHZEJviemE81XyTdp/8utctQbN84VrZL5H97wJ0Y=; b=RjZe0uWmZuTg+I6hxPfLfjOVfuF2S17sgvVGhJajSRg54TwavCLJGZa+cdStLTPE4m 0F4bj8mEaJbtszPktwrkbAm9RUOys/xNE63KhguwkDI/8ibdWBf+zuWz2MJH1ZjAOOdN PFocH/REWVb3pMP1HuRKHeoXol2Y5QcBsJmCh4sLYhDJzZFwkivq5WBO4MNfmpcNurJo xErE89CieZIELnCzHyCOjKLWJC9c7jQyYpIowORQ6KR/2cshTWi4XfxWeX7N6IDmQb5s /1ry5zd2LqZd/vN46zX/3kDlUK/OKymC4jihltV78odHBnk8cKJCbV8NzEN1jezp33F1 9XhA== X-Gm-Message-State: AC+VfDxY1quyy+0cQRkyMVkTdbq1uPDM+TaLFRuyFN3cag77aJEv7ZVM /ROyzJ7Ce0pr/Bd/+WINRQ50mg== X-Google-Smtp-Source: ACHHUZ6DvZ1icO55sjIe+oBUTsVCOGiA5PicZ0WwFJRwF2wPjABNddnCOBGHg9s9Lv+FF+wJsMuCmw== X-Received: by 2002:ac2:4430:0:b0:4f3:a99c:fbbe with SMTP id w16-20020ac24430000000b004f3a99cfbbemr2780753lfl.14.1684701522982; Sun, 21 May 2023 13:38:42 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id a15-20020a056512020f00b004f3886a63d1sm718894lfo.298.2023.05.21.13.38.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 13:38:42 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski Cc: Philipp Zabel , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, Johan Hovold Subject: [PATCH v2 10/11] arm64: dts: qcom: sm8350: switch UFS QMP PHY to new style of bindings Date: Sun, 21 May 2023 23:38:33 +0300 Message-Id: <20230521203834.22566-11-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230521203834.22566-1-dmitry.baryshkov@linaro.org> References: <20230521203834.22566-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Change the UFS QMP PHY to use newer style of QMP PHY bindings (single resource region, no per-PHY subnodes). Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sm8350.dtsi | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi index ebcb481571c2..6173521ff544 100644 --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi @@ -656,9 +656,9 @@ gcc: clock-controller@100000 { <0>, <0>, <0>, - <&ufs_mem_phy_lanes 0>, - <&ufs_mem_phy_lanes 1>, - <&ufs_mem_phy_lanes 2>, + <&ufs_mem_phy 0>, + <&ufs_mem_phy 1>, + <&ufs_mem_phy 2>, <&usb_1_qmpphy QMP_USB43DP_USB3_PIPE_CLK>, <0>; }; @@ -1658,7 +1658,7 @@ ufs_mem_hc: ufshc@1d84000 { "jedec,ufs-2.0"; reg = <0 0x01d84000 0 0x3000>; interrupts = ; - phys = <&ufs_mem_phy_lanes>; + phys = <&ufs_mem_phy>; phy-names = "ufsphy"; lanes-per-direction = <2>; #reset-cells = <1>; @@ -1702,10 +1702,8 @@ ufs_mem_hc: ufshc@1d84000 { ufs_mem_phy: phy@1d87000 { compatible = "qcom,sm8350-qmp-ufs-phy"; - reg = <0 0x01d87000 0 0x1c4>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + reg = <0 0x01d87000 0 0x1000>; + clock-names = "ref", "ref_aux"; clocks = <&rpmhcc RPMH_CXO_CLK>, @@ -1713,17 +1711,11 @@ ufs_mem_phy: phy@1d87000 { resets = <&ufs_mem_hc 0>; reset-names = "ufsphy"; - status = "disabled"; - ufs_mem_phy_lanes: phy@1d87400 { - reg = <0 0x01d87400 0 0x188>, - <0 0x01d87600 0 0x200>, - <0 0x01d87c00 0 0x200>, - <0 0x01d87800 0 0x188>, - <0 0x01d87a00 0 0x200>; - #clock-cells = <1>; - #phy-cells = <0>; - }; + #clock-cells = <1>; + #phy-cells = <0>; + + status = "disabled"; }; ipa: ipa@1e40000 {