From patchwork Thu Jul 14 12:43:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 590946 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 F3C99CCA491 for ; Thu, 14 Jul 2022 12:44:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239458AbiGNMog (ORCPT ); Thu, 14 Jul 2022 08:44:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239476AbiGNMoK (ORCPT ); Thu, 14 Jul 2022 08:44:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3363B459A3; Thu, 14 Jul 2022 05:44:08 -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 6CE2061F92; Thu, 14 Jul 2022 12:44:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1261C341D6; Thu, 14 Jul 2022 12:44:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657802645; bh=dBBUdqG3HG08FgR95FBeJSLPOANJallETi4YK4KPQew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GfZXbRTN238URE8gWC7UmhRb9OwW3MuwVBZqyRztecKyIjqES/ylA0SnQOzlrUA1B j/QPXMos0fya/YnNV14dmCGDOnkW4xRN/8pUh3hMbk42sR51hOzNsx/3ouLPMg3kmo HnOTE39tymZbYBDmspa1sUHOnJ7no1mYZRgx3moOKQ/EBZvQjpRix9/ZKrA+BlVmxC PNpwElh2uXh1Z/jVaSvPfLK+a7HeEp4GQMwEBcUOY5QbN2WPjXH1hSgCHskfW8GBMf /LNViHS9L6X6aLghDbEC/rqmMgQAJTsei2SEJC3Qyjg0Ij0nDxURi0ujZTtYW5ToEH C6iZC89/rLNhg== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1oByCR-0007EL-5v; Thu, 14 Jul 2022 14:44:11 +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 v3 27/30] phy: qcom-qmp-combo: drop pipe clock lane suffix Date: Thu, 14 Jul 2022 14:43:30 +0200 Message-Id: <20220714124333.27643-28-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220714124333.27643-1-johan+linaro@kernel.org> References: <20220714124333.27643-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 Signed-off-by: Johan Hovold Reviewed-by: Dmitry Baryshkov --- 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 faa50cf2e35e..fcb5c375425b 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -2533,7 +2533,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); @@ -2599,8 +2598,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);