From patchwork Tue Aug 30 11:29:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 601213 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 DDCD9C6FA9B for ; Tue, 30 Aug 2022 11:30:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230336AbiH3La1 (ORCPT ); Tue, 30 Aug 2022 07:30:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230019AbiH3LaK (ORCPT ); Tue, 30 Aug 2022 07:30:10 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED3F4BF63; Tue, 30 Aug 2022 04:30:06 -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 ams.source.kernel.org (Postfix) with ESMTPS id CC4FBB81A6E; Tue, 30 Aug 2022 11:30:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46865C433D6; Tue, 30 Aug 2022 11:30:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661859001; bh=m3vo4Wy3KvBHqNTBUwXMlA32thjZH3ds1YjYiHW+ZUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sKQRhltQWks0VKbANxQHWLQJV97gcHZ0C71PXoSto66IaNxlqRgC9z9MAa/rJv8od 20pxkTuie3QCCWBhd54cvWEF9wM3p58eYxH4lvafsSaYeNX8vQIR+gxm3Q1glBOk/0 MKs1K9L+Ebp6F/YUp5C7gDNbrciYGLg3cUoKmVNoizNWPLk7RbCss6DbZX8ZTAFTTx yiQYXw4wmKc7BhCESdBeEtQ2zmSW9D/nX/PwMyCZqVoPtG3aYh7/zaJRO9Cfh82oTC gYQ8zVoh/T7u+2UzRtQ58dh7Fu5vodSm6p7WfEDlNEreDA2ypgp7VjCFYLhEI2bn/E z53vx1FqKvIKw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1oSzRP-000111-2m; Tue, 30 Aug 2022 13:29:59 +0200 From: Johan Hovold To: Vinod Koul , Rob Herring , Krzysztof Kozlowski Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Kishon Vijay Abraham I , Dmitry Baryshkov , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , Krzysztof Kozlowski Subject: [PATCH v4 25/30] phy: qcom-qmp-pcie: drop pipe clock lane suffix Date: Tue, 30 Aug 2022 13:29:18 +0200 Message-Id: <20220830112923.3725-26-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220830112923.3725-1-johan+linaro@kernel.org> References: <20220830112923.3725-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@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. Reviewed-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov Signed-off-by: Johan Hovold --- 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 2d65e1f56bfc..3ddbb8e89f04 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c @@ -2314,7 +2314,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); @@ -2374,8 +2373,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);