[PATCH v6 05/14] phy: qcom: qmp-usbc: Move reset config into PHY cfg

[Xiangxu Yin]

The original reset list only works for USB-only PHYs. USB3DP PHYs require
different reset names such as "dp_phy", so they need a separate list.

Moving reset configuration into qmp_phy_cfg allows per-PHY customization
without adding special-case logic in DT parsing. The legacy DT path keeps
using the old hardcoded list, while non-legacy paths use cfg->reset_list.

Signed-off-by: Xiangxu Yin <xiangxu....@oss.qualcomm.com>
---
 drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c 
b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
index 
3b48c69f9c3cb7daec495ebc281b83fe34e56881..f9e20f43435c050e33e9490343a4693a339d692a
 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
@@ -335,7 +335,8 @@ struct qmp_phy_cfg {
        int (*configure_dp_phy)(struct qmp_usbc *qmp);
        int (*calibrate_dp_phy)(struct qmp_usbc *qmp);
 
-       /* regulators to be requested */
+       const char * const *reset_list;
+       int num_resets;
        const struct regulator_bulk_data *vreg_list;
        int num_vregs;
 
@@ -464,6 +465,8 @@ static const struct qmp_phy_cfg msm8998_usb3phy_cfg = {
        .rx_tbl_num             = ARRAY_SIZE(msm8998_usb3_rx_tbl),
        .pcs_tbl                = msm8998_usb3_pcs_tbl,
        .pcs_tbl_num            = ARRAY_SIZE(msm8998_usb3_pcs_tbl),
+       .reset_list             = usb3phy_reset_l,
+       .num_resets             = ARRAY_SIZE(usb3phy_reset_l),
        .vreg_list              = qmp_phy_msm8998_vreg_l,
        .num_vregs              = ARRAY_SIZE(qmp_phy_msm8998_vreg_l),
        .regs                   = qmp_v3_usb3phy_regs_layout,
@@ -480,6 +483,8 @@ static const struct qmp_phy_cfg qcm2290_usb3phy_cfg = {
        .rx_tbl_num             = ARRAY_SIZE(qcm2290_usb3_rx_tbl),
        .pcs_tbl                = qcm2290_usb3_pcs_tbl,
        .pcs_tbl_num            = ARRAY_SIZE(qcm2290_usb3_pcs_tbl),
+       .reset_list             = usb3phy_reset_l,
+       .num_resets             = ARRAY_SIZE(usb3phy_reset_l),
        .vreg_list              = qmp_phy_sm2290_vreg_l,
        .num_vregs              = ARRAY_SIZE(qmp_phy_sm2290_vreg_l),
        .regs                   = qmp_v3_usb3phy_regs_layout_qcm2290,
@@ -496,6 +501,8 @@ static const struct qmp_phy_cfg sdm660_usb3phy_cfg = {
        .rx_tbl_num             = ARRAY_SIZE(sdm660_usb3_rx_tbl),
        .pcs_tbl                = qcm2290_usb3_pcs_tbl,
        .pcs_tbl_num            = ARRAY_SIZE(qcm2290_usb3_pcs_tbl),
+       .reset_list             = usb3phy_reset_l,
+       .num_resets             = ARRAY_SIZE(usb3phy_reset_l),
        .vreg_list              = qmp_phy_msm8998_vreg_l,
        .num_vregs              = ARRAY_SIZE(qmp_phy_msm8998_vreg_l),
        .regs                   = qmp_v3_usb3phy_regs_layout_qcm2290,
@@ -512,6 +519,8 @@ static const struct qmp_phy_cfg qcs615_usb3phy_cfg = {
        .rx_tbl_num             = ARRAY_SIZE(qcm2290_usb3_rx_tbl),
        .pcs_tbl                = qcm2290_usb3_pcs_tbl,
        .pcs_tbl_num            = ARRAY_SIZE(qcm2290_usb3_pcs_tbl),
+       .reset_list             = usb3phy_reset_l,
+       .num_resets             = ARRAY_SIZE(usb3phy_reset_l),
        .vreg_list              = qmp_phy_qcs615_vreg_l,
        .num_vregs              = ARRAY_SIZE(qmp_phy_qcs615_vreg_l),
        .regs                   = qmp_v3_usb3phy_regs_layout_qcm2290,
@@ -1051,8 +1060,7 @@ static int qmp_usbc_parse_dt(struct qmp_usbc *qmp)
                                     "failed to get pipe clock\n");
        }
 
-       ret = qmp_usbc_reset_init(qmp, usb3phy_reset_l,
-                                ARRAY_SIZE(usb3phy_reset_l));
+       ret = qmp_usbc_reset_init(qmp, cfg->reset_list, cfg->num_resets);
        if (ret)
                return ret;
 

-- 
2.34.1