From patchwork Thu Jul 7 13:47:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 588964 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 D3BBCCCA486 for ; Thu, 7 Jul 2022 13:48:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236110AbiGGNsV (ORCPT ); Thu, 7 Jul 2022 09:48:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236092AbiGGNrp (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 BF5BC21E05; Thu, 7 Jul 2022 06:47:43 -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 482F2621A8; Thu, 7 Jul 2022 13:47:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 581ABC36AE3; 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=81fBkqVO0wiCN/BlxX9juNl1UHR5VbfWAbrydxsSCok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=coKpspB+X5nlgE9zSTfUQRUSzcyeDeCwIAhBwhOqfq35Y+fJ2BGSiXofPZ9jpnJ49 jWTaRBNY3UedLekf+/hZpjyTn7dven6f47XmV7khRukw3XKxRB40RWttP9cVnfW2hW Yigjba019i6pyU0OT+9af92qqsRFUDgWkOUoiSr4aW2spn66CxlSaHDI84KCOV8JXl Vhb5fKJSFuORaneHSyqlVen9i+Nmu29cuFRizbWnxjqSIuJ7931RwDLzCmWQ6lGsnD pqP/4EK/abBDl0s4m04EUcgx3Yc9up5/01OaoU/NtCQ5Lb93SSeefkeesx6GQJH0ww /JCWYCGuewcfg== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1o9Rr6-0000yg-0q; Thu, 07 Jul 2022 15:47:44 +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 27/30] phy: qcom-qmp-combo: drop pipe clock lane suffix Date: Thu, 7 Jul 2022 15:47:22 +0200 Message-Id: <20220707134725.3512-28-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-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 b266514ae9ee..b90a28cad4ce 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -2495,7 +2495,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); @@ -2558,8 +2557,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);