From patchwork Tue Aug 30 11:29: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: 601922 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 631FEC0502A for ; Tue, 30 Aug 2022 11:30:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230294AbiH3LaW (ORCPT ); Tue, 30 Aug 2022 07:30:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230128AbiH3LaI (ORCPT ); Tue, 30 Aug 2022 07:30:08 -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 839D3220DD; Tue, 30 Aug 2022 04:30:05 -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 E54E26155F; Tue, 30 Aug 2022 11:30:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 722C5C433C1; 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=UQQZwGZMsAgB6wntjPMvyAwdQR7zbV03fNjOm2r8HlU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=st9qQ5KvmdF62rXhskVV3dkakgNz8dtSIhCAltnPj9MW+DQPoW/tWOW2nRvVP2Vcx 3ZrtXos7R/zzQV/eHTQMlQ693gX7ufLkdDxCZfqT9qMHn3Jc1r7VH3fhhE0MzxnoNc D7h9Mqkx7Fr8vH4CHSYUexGFon/1JBhR5QvXXNteNpHagF7SXr/Kf0U+yjtioBJjEq g6sPBZLRQ6TQRSI9q2FNRrA4gmkH2CeZgXouoBNaYRkz+vDWKirIuvBHEWZ/N1HQHI Q86cPk+OMMO1kuR8g0f/itUx4+awbuDcuLUR/TYsf3LSu2dr7/jsuZTIrZCe7p5WMX V20WWcmZ3VGFA== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1oSzRP-000117-82; 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 27/30] phy: qcom-qmp-combo: drop pipe clock lane suffix Date: Tue, 30 Aug 2022 13:29:20 +0200 Message-Id: <20220830112923.3725-28-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: 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. Reviewed-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov Signed-off-by: Johan Hovold --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index 41e7548ef0b5..d200cd5ca4fa 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -2723,7 +2723,6 @@ int qcom_qmp_phy_combo_create(struct device *dev, struct device_node *np, int id struct phy *generic_phy; struct qmp_phy *qphy; const struct phy_ops *ops; - char prop_name[MAX_PROP_NAME]; int ret; qphy = devm_kzalloc(dev, sizeof(*qphy), GFP_KERNEL); @@ -2789,8 +2788,7 @@ int qcom_qmp_phy_combo_create(struct device *dev, struct device_node *np, int id * Otherwise, we initialize pipe clock to NULL for * all phys that don't need this. */ - 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)) { if (cfg->type == PHY_TYPE_USB3) { ret = PTR_ERR(qphy->pipe_clk);