[PATCH 15/22] phy: qcom-qmp-combo: rename sc8280xp config

From: Johan Hovold
Date: Fri Nov 11 2022 - 03:57:47 EST


In preparation for merging the USB and DP configurations, drop the
"combo" infix from the SC8280XP combined configuration for consistency
with the other platforms.

Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
---
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 c01cedda221c..499368e19e00 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,
};
@@ -2858,7 +2858,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",
--
2.37.4