From patchwork Thu Jul 7 13:47:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 588972 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 DBE81C2BBE6 for ; Thu, 7 Jul 2022 13:48:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235923AbiGGNsK (ORCPT ); Thu, 7 Jul 2022 09:48:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236088AbiGGNrp (ORCPT ); Thu, 7 Jul 2022 09:47:45 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C8A1313BC; Thu, 7 Jul 2022 06:47:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 44DA2621F2; Thu, 7 Jul 2022 13:47:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33E8CC341DA; Thu, 7 Jul 2022 13:47:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657201661; bh=v5UJMW9c4gLV3XSBwhsATFdrts9czGeLiGlvTRBcqmk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bPERw48wwlWfteXfFD0mLz0VTCOYBs4EmbDMZ/vBEKsw8bDJeDC3bFewXS9BPfMAh DLmwNZdwN+OSxgZOaWt2IEsQAcC9aR79eUsPuXmLEvKReRosZdxfg4MNaJudo1esP3 oiDjNnCaM+txVPfjuk4Cy2p5WlQlHzUfCMY6pc9D/OVkQrYDc9ejiEcDvWLH+YqNUD uJFo0reUS0UsAveQMcFgapIrCCrAU7r+aPK68t8Fj1QSdjuhOKdSJMKjlflRxASxbU RhU6XOnlcN9i7LgDUveoYEjyD/kWdjeHXEZJ45bP6RQka3S9kR/dczEgjpcXb8hHt4 zeM7B4zE1gLGw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1o9Rr5-0000yU-RK; Thu, 07 Jul 2022 15:47:43 +0200 From: Johan Hovold To: Vinod Koul , Rob Herring , Krzysztof Kozlowski Cc: Dmitry Baryshkov , Andy Gross , Bjorn Andersson , Kishon Vijay Abraham I , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 25/30] phy: qcom-qmp-pcie: drop pipe clock lane suffix Date: Thu, 7 Jul 2022 15:47:20 +0200 Message-Id: <20220707134725.3512-26-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220707134725.3512-1-johan+linaro@kernel.org> References: <20220707134725.3512-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The pipe clock is defined in the "lane" node so there's no need to keep adding a redundant lane-number suffix to the clock name. Update driver to support the new binding where the pipe clock name has been deprecated by instead requesting the clock by index. Signed-off-by: Johan Hovold Reviewed-by: Krzysztof Kozlowski --- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c index 385ea3d8de08..67476d48e71b 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c @@ -2154,7 +2154,6 @@ int qcom_qmp_phy_pcie_create(struct device *dev, struct device_node *np, int id, struct qcom_qmp *qmp = dev_get_drvdata(dev); struct phy *generic_phy; struct qmp_phy *qphy; - char prop_name[MAX_PROP_NAME]; int ret; qphy = devm_kzalloc(dev, sizeof(*qphy), GFP_KERNEL); @@ -2210,8 +2209,7 @@ int qcom_qmp_phy_pcie_create(struct device *dev, struct device_node *np, int id, if (!qphy->pcs_misc) dev_vdbg(dev, "PHY pcs_misc-reg not used\n"); - snprintf(prop_name, sizeof(prop_name), "pipe%d", id); - qphy->pipe_clk = devm_get_clk_from_child(dev, np, prop_name); + qphy->pipe_clk = devm_get_clk_from_child(dev, np, NULL); if (IS_ERR(qphy->pipe_clk)) { return dev_err_probe(dev, PTR_ERR(qphy->pipe_clk), "failed to get lane%d pipe clock\n", id);