diff mbox series

[42/43] phy: qcom-qmp-pcie-msm8996: drop reset lane suffix

Message ID	20220705094239.17174-43-johan+linaro@kernel.org
State	New
Headers	show Return-Path: <linux-arm-msm-owner@kernel.org> From: Johan Hovold <johan+linaro@kernel.org> To: Vinod Koul <vkoul@kernel.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> Cc: Andy Gross <agross@kernel.org>, Bjorn Andersson <bjorn.andersson@linaro.org>, Kishon Vijay Abraham I <kishon@ti.com>, linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold <johan+linaro@kernel.org> Subject: [PATCH 42/43] phy: qcom-qmp-pcie-msm8996: drop reset lane suffix Date: Tue, 5 Jul 2022 11:42:38 +0200 Message-Id: <20220705094239.17174-43-johan+linaro@kernel.org> In-Reply-To: <20220705094239.17174-1-johan+linaro@kernel.org> References: <20220705094239.17174-1-johan+linaro@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	phy: qcom,qmp: fix dt-bindings and deprecate lane suffix \| expand [00/43] phy: qcom,qmp: fix dt-bindings and deprecate lane suffix [01/43] dt-bindings: phy: qcom,qmp: fix bogus clock-cells property [02/43] dt-bindings: phy: qcom,qmp: sort compatible strings [03/43] dt-bindings: phy: qcom,qmp: clean up descriptions [04/43] dt-bindings: phy: qcom,qmp: clean up example [05/43] dt-bindings: phy: qcom,qmp: drop child-node comment [06/43] dt-bindings: phy: qcom,qmp: split out msm8996-qmp-pcie-phy [07/43] dt-bindings: phy: qcom,msm8996-qmp-pcie: clean up constraints [08/43] dt-bindings: phy: qcom,msm8996-qmp-pcie: add missing child node schema [09/43] dt-bindings: phy: qcom,msm8996-qmp-pcie: add example node [10/43] dt-bindings: phy: qcom,msm8996-qmp-pcie: deprecate PIPE clock names [11/43] dt-bindings: phy: qcom,msm8996-qmp-pcie: deprecate reset names [12/43] dt-bindings: phy: qcom,qmp: split out PCIe PHY binding [13/43] dt-bindings: phy: qcom,qmp-pcie: clean up register constraints [14/43] dt-bindings: phy: qcom,qmp-pcie: clean up clock constraints [15/43] dt-bindings: phy: qcom,qmp-pcie: clean up reset constraints [16/43] dt-bindings: phy: qcom,qmp-pcie: drop unused vddp-ref-clk supply [17/43] dt-bindings: phy: qcom,qmp-pcie: add missing child node schema [18/43] dt-bindings: phy: qcom,qmp-pcie: add example node [19/43] dt-bindings: phy: qcom,qmp-pcie: deprecate PIPE clock name [20/43] dt-bindings: phy: qcom,qmp: split out UFS PHY binding [21/43] dt-bindings: phy: qcom,qmp-ufs: clean up supplies [22/43] dt-bindings: phy: qcom,qmp-ufs: clean up reset providers [23/43] dt-bindings: phy: qcom,qmp-ufs: clean up clock constraints [24/43] dt-bindings: phy: qcom,qmp-ufs: clean up register constraints [25/43] dt-bindings: phy: qcom,qmp-ufs: add missing SM8450 clock [26/43] dt-bindings: phy: qcom,qmp-ufs: add missing SM8150 power domain [27/43] dt-bindings: phy: qcom,qmp-ufs: add missing child node schema [28/43] dt-bindings: phy: qcom,qmp-ufs: add example node [29/43] dt-bindings: phy: qcom,qmp: split out USB binding [30/43] dt-bindings: phy: qcom,qmp-usb: clean up clock constraints [31/43] dt-bindings: phy: qcom,qmp-usb: clean up supplies [32/43] dt-bindings: phy: qcom,qmp-usb: drop unused vddp-ref-clk supply [33/43] dt-bindings: phy: qcom,qmp-usb: clean up reset providers [34/43] dt-bindings: phy: qcom,qmp-usb: add missing child node schema [35/43] dt-bindings: phy: qcom,qmp-usb: deprecate PIPE clock name [36/43] dt-bindings: phy: qcom,qmp-usb3-dp: fix bogus clock-cells property [37/43] dt-bindings: phy: qcom,qmp-usb3-dp: deprecate USB PIPE clock name [38/43] phy: qcom-qmp-pcie: drop pipe clock lane suffix [39/43] phy: qcom-qmp-combo: drop unused lane reset [40/43] phy: qcom-qmp-combo: drop pipe clock lane suffix [41/43] phy: qcom-qmp-pcie-msm8996: drop pipe clock lane suffix [42/43] phy: qcom-qmp-pcie-msm8996: drop reset lane suffix [43/43] phy: qcom-qmp-usb: drop pipe clock lane suffix

Commit Message

Johan Hovold July 5, 2022, 9:42 a.m. UTC

The lane reset is defined in the "lane" node so there's no need to keep
adding a redundant lane-number suffix to the reset name.

Drop the lane-number suffix from the lane reset name, but continue
supporting the legacy name as a fall back.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c
index b8481dab54db..9ddb42fa5f7a 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c
@@ -915,9 +915,12 @@  int qcom_qmp_phy_pcie_msm8996_create(struct device *dev, struct device_node *np,
 				     "failed to get lane%d pipe clock\n", id);
 	}
 
-	/* Get lane reset, if any */
-	snprintf(prop_name, sizeof(prop_name), "lane%d", id);
-	qphy->lane_rst = of_reset_control_get_exclusive(np, prop_name);
+	qphy->lane_rst = of_reset_control_get_exclusive(np, "lane");
+	if (IS_ERR(qphy->lane_rst) && PTR_ERR(qphy->lane_rst) != -EPROBE_DEFER) {
+		/* Fall back to the legacy lane reset name. */
+		snprintf(prop_name, sizeof(prop_name), "lane%d", id);
+		qphy->lane_rst = of_reset_control_get_exclusive(np, prop_name);
+	}
 	if (IS_ERR(qphy->lane_rst)) {
 		dev_err(dev, "failed to get lane%d reset\n", id);
 		return PTR_ERR(qphy->lane_rst);