Hi,
On Wed, May 25, 2022 at 12:37 PM Kuogee Hsieh quic_khsieh@quicinc.com wrote:
This patch add regulator_set_load() before enable regulator at DP phy driver.
Signed-off-by: Kuogee Hsieh quic_khsieh@quicinc.com Reviewed-by: Stephen Boyd swboyd@chromium.org
drivers/phy/qualcomm/phy-qcom-qmp.c | 41 +++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 9 deletions(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index b144ae1..5fda39f 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -3075,6 +3075,17 @@ static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_pcs_misc_tbl[] = { QMP_PHY_INIT_CFG(QPHY_V5_20_PCS_PCIE_G4_PRE_GAIN, 0x2e), };
+/* list of regulators */ +struct qmp_regulator_data {
const char *name;unsigned int enable_load;+};
+struct qmp_regulator_data qmp_phy_vreg_l[] = {
{ .name = "vdda-phy", .enable_load = 21800 },{ .name = "vdda-pll", .enable_load = 36000 },+};
struct qmp_phy;
/* struct qmp_phy_cfg - per-PHY initialization config */ @@ -3129,7 +3140,7 @@ struct qmp_phy_cfg { const char * const *reset_list; int num_resets; /* regulators to be requested */
const char * const *vreg_list;
const struct qmp_regulator_data *vreg_list; int num_vregs; /* array of registers with different offsets */@@ -3341,11 +3352,6 @@ static const char * const sdm845_pciephy_reset_l[] = { "phy", };
-/* list of regulators */ -static const char * const qmp_phy_vreg_l[] = {
"vdda-phy", "vdda-pll",-};
static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = { .type = PHY_TYPE_USB3, .nlanes = 1, @@ -5488,16 +5494,33 @@ static int qcom_qmp_phy_vreg_init(struct device *dev, const struct qmp_phy_cfg * { struct qcom_qmp *qmp = dev_get_drvdata(dev); int num = cfg->num_vregs;
int i;
int ret, i; qmp->vregs = devm_kcalloc(dev, num, sizeof(*qmp->vregs), GFP_KERNEL); if (!qmp->vregs) return -ENOMEM; for (i = 0; i < num; i++)
qmp->vregs[i].supply = cfg->vreg_list[i];
qmp->vregs[i].supply = cfg->vreg_list[i].name;
return devm_regulator_bulk_get(dev, num, qmp->vregs);
ret = devm_regulator_bulk_get(dev, num, qmp->vregs);if (ret) {dev_err(dev, "failed at devm_regulator_bulk_get\n");goto err;
There's no reason for a goto and in general kernel style that I've seen would suggest just "return ret;" here
}for (i = 0; i < num; i++) {ret = regulator_set_load(qmp->vregs[i].consumer,cfg->vreg_list[i].enable_load);
super nitty, but there should be one more space before "cfg" to line up under the parenthesis.
if (ret) {dev_err(dev, "failed to set load at %s\n",qmp->vregs[i].supply);break;
optional: I guess I don't care tons, but I'd be tempted to just "return ret;" here. Then at the end of the function just "return 0;"
All of these are pretty nitty though, so I'm happy enough with:
Reviewed-by: Douglas Anderson dianders@chromium.org
On Wed, May 25, 2022 at 12:37 PM Kuogee Hsieh quic_khsieh@quicinc.com wrote:
This patch add regulator_set_load() before enable regulator at DP phy driver.
Signed-off-by: Kuogee Hsieh quic_khsieh@quicinc.com Reviewed-by: Stephen Boyd swboyd@chromium.org
drivers/phy/qualcomm/phy-qcom-qmp.c | 41 +++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 9 deletions(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index b144ae1..5fda39f 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -3075,6 +3075,17 @@ static const struct qmp_phy_init_tbl sm8450_qmp_gen4x2_pcie_pcs_misc_tbl[] = { QMP_PHY_INIT_CFG(QPHY_V5_20_PCS_PCIE_G4_PRE_GAIN, 0x2e), };
+/* list of regulators */ +struct qmp_regulator_data {
const char *name;unsigned int enable_load;+};
+struct qmp_regulator_data qmp_phy_vreg_l[] = {
{ .name = "vdda-phy", .enable_load = 21800 },{ .name = "vdda-pll", .enable_load = 36000 },+};
struct qmp_phy;
/* struct qmp_phy_cfg - per-PHY initialization config */ @@ -3129,7 +3140,7 @@ struct qmp_phy_cfg { const char * const *reset_list; int num_resets; /* regulators to be requested */
const char * const *vreg_list;
const struct qmp_regulator_data *vreg_list; int num_vregs; /* array of registers with different offsets */@@ -3341,11 +3352,6 @@ static const char * const sdm845_pciephy_reset_l[] = { "phy", };
-/* list of regulators */ -static const char * const qmp_phy_vreg_l[] = {
"vdda-phy", "vdda-pll",-};
static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = { .type = PHY_TYPE_USB3, .nlanes = 1, @@ -5488,16 +5494,33 @@ static int qcom_qmp_phy_vreg_init(struct device *dev, const struct qmp_phy_cfg * { struct qcom_qmp *qmp = dev_get_drvdata(dev); int num = cfg->num_vregs;
int i;
int ret, i; qmp->vregs = devm_kcalloc(dev, num, sizeof(*qmp->vregs), GFP_KERNEL); if (!qmp->vregs) return -ENOMEM; for (i = 0; i < num; i++)
qmp->vregs[i].supply = cfg->vreg_list[i];
qmp->vregs[i].supply = cfg->vreg_list[i].name;
return devm_regulator_bulk_get(dev, num, qmp->vregs);
ret = devm_regulator_bulk_get(dev, num, qmp->vregs);if (ret) {dev_err(dev, "failed at devm_regulator_bulk_get\n");goto err;}for (i = 0; i < num; i++) {ret = regulator_set_load(qmp->vregs[i].consumer,cfg->vreg_list[i].enable_load);if (ret) {dev_err(dev, "failed to set load at %s\n",qmp->vregs[i].supply);break;}}+err:
return ret;}
static int qcom_qmp_phy_reset_init(struct device *dev, const struct qmp_phy_cfg *cfg)
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project