| Message ID | 20210831161843.1044580-1-dmitry.baryshkov@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | regulator: qcom-rpmh-regulator: fix pm8009-1 ldo7 resource name | expand |
On Tue 31 Aug 09:18 PDT 2021, Dmitry Baryshkov wrote: > Fix a typo in the pm8009 LDO7 declaration, it uses resource name ldo%s6 > instead of ldo%s7. > > Fixes: 951384cabc5d ("regulator: qcom-rpmh-regulator: add pm8009-1 chip revision") > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/dp/dp_drm.c | 6 ++++++ > drivers/regulator/qcom-rpmh-regulator.c | 2 +- > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c > index 764f4b81017e..486a653e2fea 100644 > --- a/drivers/gpu/drm/msm/dp/dp_drm.c > +++ b/drivers/gpu/drm/msm/dp/dp_drm.c > @@ -114,6 +114,11 @@ static enum drm_mode_status dp_connector_mode_valid( > return dp_display_validate_mode(dp_disp, mode->clock); > } > > +static struct drm_encoder *dp_connector_best_encoder(struct drm_connector *connector) > +{ > + return to_dp_connector(connector)->dp_display->encoder; > +} > + > static const struct drm_connector_funcs dp_connector_funcs = { > .detect = dp_connector_detect, > .fill_modes = drm_helper_probe_single_connector_modes, > @@ -126,6 +131,7 @@ static const struct drm_connector_funcs dp_connector_funcs = { > static const struct drm_connector_helper_funcs dp_connector_helper_funcs = { > .get_modes = dp_connector_get_modes, > .mode_valid = dp_connector_mode_valid, > + .best_encoder = dp_connector_best_encoder, > }; This part doesn't belong here. > > /* connector initialization */ > diff --git a/drivers/regulator/qcom-rpmh-regulator.c b/drivers/regulator/qcom-rpmh-regulator.c > index 6cca910a76de..7f458d510483 100644 > --- a/drivers/regulator/qcom-rpmh-regulator.c > +++ b/drivers/regulator/qcom-rpmh-regulator.c > @@ -991,7 +991,7 @@ static const struct rpmh_vreg_init_data pm8009_1_vreg_data[] = { > RPMH_VREG("ldo4", "ldo%s4", &pmic5_nldo, "vdd-l4"), > RPMH_VREG("ldo5", "ldo%s5", &pmic5_pldo, "vdd-l5-l6"), > RPMH_VREG("ldo6", "ldo%s6", &pmic5_pldo, "vdd-l5-l6"), > - RPMH_VREG("ldo7", "ldo%s6", &pmic5_pldo_lv, "vdd-l7"), > + RPMH_VREG("ldo7", "ldo%s7", &pmic5_pldo_lv, "vdd-l7"), This looks good though! Please drop the lingering DRM part and add my R-b. Thanks, Bjorn > {} > }; > > -- > 2.33.0 >
diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c index 764f4b81017e..486a653e2fea 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -114,6 +114,11 @@ static enum drm_mode_status dp_connector_mode_valid( return dp_display_validate_mode(dp_disp, mode->clock); } +static struct drm_encoder *dp_connector_best_encoder(struct drm_connector *connector) +{ + return to_dp_connector(connector)->dp_display->encoder; +} + static const struct drm_connector_funcs dp_connector_funcs = { .detect = dp_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, @@ -126,6 +131,7 @@ static const struct drm_connector_funcs dp_connector_funcs = { static const struct drm_connector_helper_funcs dp_connector_helper_funcs = { .get_modes = dp_connector_get_modes, .mode_valid = dp_connector_mode_valid, + .best_encoder = dp_connector_best_encoder, }; /* connector initialization */ diff --git a/drivers/regulator/qcom-rpmh-regulator.c b/drivers/regulator/qcom-rpmh-regulator.c index 6cca910a76de..7f458d510483 100644 --- a/drivers/regulator/qcom-rpmh-regulator.c +++ b/drivers/regulator/qcom-rpmh-regulator.c @@ -991,7 +991,7 @@ static const struct rpmh_vreg_init_data pm8009_1_vreg_data[] = { RPMH_VREG("ldo4", "ldo%s4", &pmic5_nldo, "vdd-l4"), RPMH_VREG("ldo5", "ldo%s5", &pmic5_pldo, "vdd-l5-l6"), RPMH_VREG("ldo6", "ldo%s6", &pmic5_pldo, "vdd-l5-l6"), - RPMH_VREG("ldo7", "ldo%s6", &pmic5_pldo_lv, "vdd-l7"), + RPMH_VREG("ldo7", "ldo%s7", &pmic5_pldo_lv, "vdd-l7"), {} };
Fix a typo in the pm8009 LDO7 declaration, it uses resource name ldo%s6 instead of ldo%s7. Fixes: 951384cabc5d ("regulator: qcom-rpmh-regulator: add pm8009-1 chip revision") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/dp/dp_drm.c | 6 ++++++ drivers/regulator/qcom-rpmh-regulator.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) -- 2.33.0