On Fri, Sep 19, 2025 at 10:24:22PM +0800, Xiangxu Yin wrote:
> Move resets to qmp_phy_cfg for per-PHY customization. Keep legacy DT
> path on the old hardcoded list; non-legacy path uses cfg->reset_list.
>
> Signed-off-by: Xiangxu Yin <[email protected]>
> ---
> drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 18 +++++++++++++++---
> 1 file changed, 15 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..3d228db9ef0882eb76e7ab9e82f8122fa9cfe314
> 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;
>
> @@ -428,6 +429,10 @@ static const char * const usb3phy_reset_l[] = {
> "phy_phy", "phy",
> };
>
> +static const char * const usb3dpphy_reset_l[] = {
> + "phy_phy", "dp_phy",
> +};
This is unused in this patch. It should go to the patch adding QCS615 DP
PHY compatible and the rest of the config data.
> +
> static const struct regulator_bulk_data qmp_phy_msm8998_vreg_l[] = {
> { .supply = "vdda-phy", .init_load_uA = 68600 },
> { .supply = "vdda-pll", .init_load_uA = 14200 },
> @@ -464,6 +469,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 +487,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 +505,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 +523,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 +1064,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
>
--
With best wishes
Dmitry
