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: 12909639 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E08D0CCA49D for ; Thu, 7 Jul 2022 13:48:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AEwmxctV70z+RtY5yv0rzs6LkO83ghj2R+skkXXdt40=; b=zO7+7rWr9zNXEi O44qC7Dysl/hw3e+grALHQFLmK9wo4SpndTtAphADaabLxikFv+ohGsXHPOvswvCTjokmR8BPU8dq vi3j8/rmyM79DebJDW7Xm6WkETmGKtikmwcCHoTqbliFcYvkDBBfj8HkXtPc96bixrqLSVV0v35xN tKuDXPPxq4rrjtKRwJOdTBZ4UWjV1qknkSzOq3Hx/viG9EVhWC8nxHVMHOhT7W37upMnVufjJW5is /QvaCBWbptmp0X9OD6VPY5UxZ7uChFQot5EwpfNbJhe3AsQRprjvKSsXUrBTSCYIT+I36SNpTShOo T/h+35XoLo0Xqhjt/ZqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9RrQ-00GL0o-Pr; Thu, 07 Jul 2022 13:48:04 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9RrC-00GKg4-Lv for linux-phy@lists.infradead.org; Thu, 07 Jul 2022 13:47:56 +0000 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 9BD2762212; 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220707_064750_831307_582653F8 X-CRM114-Status: GOOD ( 13.17 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.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);