From patchwork Mon Nov 14 11:06:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 19709 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2085022wru; Mon, 14 Nov 2022 03:11:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf5z2UY2KMC55AoxijczQ0DC7BeQ+F0eGG1YeA19b2B/sPqfp2dddk7v4AGlhUMjCAdhGMMM X-Received: by 2002:a63:d753:0:b0:46f:8e45:8da1 with SMTP id w19-20020a63d753000000b0046f8e458da1mr11419245pgi.71.1668424306371; Mon, 14 Nov 2022 03:11:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668424306; cv=none; d=google.com; s=arc-20160816; b=Y53MpSSv0p7F62m0DP/Ckdg/xPUmI63J0CS8ypSIPadtm2lk2gJDk9XxsOGV5PMSfX DPEhkCPoSMWjSJGTA8zjjWzwjw5WtxgnI1Yh31kWYyJGXNsaC9OucbG3JbZWA+dJLBMH ZSdoIDnXVSrb0U/q8Jqda7zzkGJeNaPbUOef7LFQrE6puFMOwPjYlmCuwAjMUDrSH7Pk 60WfYx/MR723MM1JuobdGf1GArv9Pc5v77bHegURgMf0uqvIBh0tHtesVmPIYnzlrXkL BPV9cAV8tirT016zAu6yzoEfoQurEWk0sNDjEkwmf1jITW76SPkNZp9yFaEVQiPJSbMx r8nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=A/SZ/lHtGdKXi98lMwwFRNpCVkKsTCybbycpglY8Vzg=; b=ccUCfIvb7FDi5l3qugJFBwlv+O/XIJn6CgD4DirChyjqiGo5KUB6bTKwP4h1077Qcg Bt46cb5j0Ht+GHuAXEcwWrRtd9P3JBN0qYAq9rDRnw5YN3r8calSzLhEcivNHbwtxkQu NxbiLOixlJ/sq0Gx5x8V7cvbEZzIU3oWGYcmvhlWu7DWuqjbz3UJXVb3S4i0Z2yxSFS5 Fm9a/L1Td/UTyP+gKxSNE55jF5DH8uHFYbwFhyPGsHwexUmzCiB1/s36ZHA7gH+icS4b w4K5cZgfmYr+rzhkOMtgK6TTpRTaKoZms9EW6ijRdT1YHcu+jIe4uisZKHFfSM75AKxy oydg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sQOKC8dV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p10-20020a170902eaca00b001747ed48ee8si8665725pld.150.2022.11.14.03.11.32; Mon, 14 Nov 2022 03:11:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sQOKC8dV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236575AbiKNLJK (ORCPT + 99 others); Mon, 14 Nov 2022 06:09:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236597AbiKNLH3 (ORCPT ); Mon, 14 Nov 2022 06:07:29 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 321E221804; Mon, 14 Nov 2022 03:07:19 -0800 (PST) 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 536E4B80DF0; Mon, 14 Nov 2022 11:07:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1017C4FF15; Mon, 14 Nov 2022 11:07:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668424034; bh=kJP38ZwmxY+SSFCvUPkMeWW5gEsGGyjDPb8h9yV4MwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sQOKC8dVPTg2lM+avo5ZTFLkH4JKOPfbQ4OVzmh19AfMoNWCYbcQ939wb+3Un8QdL cNlObyxgSCbhywTqKZfWYPajGyA4PoFS3rJ5gFGZc7LVYvZ6aKhz4H8+kV0ixc0uqv HGmEnwrVRoobWE68xaMJXN+L97nbsEcG3jW8gjGtIR2AAs/asfeMMpQYWd69FfH+T5 c4GOciXieH1EVeoMB+0iFrxCZ6XuSkYyyCzYpEAoBa+k6/FD7TE1tyetjE3fTAb6Xo 9DGH2XgyK/ORWK84hg1ObEP/LwSPjQmEbFYg/qIXqy8geXayxx1kNNffsD6WUiyi5T MA8XaTmvd/fHw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1ouXIZ-0001F6-0z; Mon, 14 Nov 2022 12:06:43 +0100 From: Johan Hovold To: Vinod Koul Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Dmitry Baryshkov , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 15/22] phy: qcom-qmp-combo: rename sc8280xp config Date: Mon, 14 Nov 2022 12:06:14 +0100 Message-Id: <20221114110621.4639-16-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221114110621.4639-1-johan+linaro@kernel.org> References: <20221114110621.4639-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749469685574418018?= X-GMAIL-MSGID: =?utf-8?q?1749469685574418018?= In preparation for merging the USB and DP configurations, drop the "combo" infix from the SC8280XP combined configuration for consistency with the other platforms. Reviewed-by: Dmitry Baryshkov Signed-off-by: Johan Hovold --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index 50c011d23a9e..d3fd6bde4af5 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -1228,7 +1228,7 @@ static const struct qmp_phy_cfg sc8280xp_usb43dp_dp_cfg = { .calibrate_dp_phy = qcom_qmp_v4_dp_phy_calibrate, }; -static const struct qmp_phy_combo_cfg sc8280xp_usb43dpphy_combo_cfg = { +static const struct qmp_phy_combo_cfg sc8280xp_usb43dpphy_cfg = { .usb_cfg = &sc8280xp_usb43dp_usb_cfg, .dp_cfg = &sc8280xp_usb43dp_dp_cfg, }; @@ -2857,7 +2857,7 @@ static const struct of_device_id qmp_combo_of_match_table[] = { }, { .compatible = "qcom,sc8280xp-qmp-usb43dp-phy", - .data = &sc8280xp_usb43dpphy_combo_cfg, + .data = &sc8280xp_usb43dpphy_cfg, }, { .compatible = "qcom,sdm845-qmp-usb3-dp-phy",