Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'regulator-fix-v6.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
"Two small driver specific fixes: one incorrect definition for one of
the Qualcomm regulators and better handling of poorly formed DTs in
the DA9063 driver"

* tag 'regulator-fix-v6.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: qcom-rpmh: Fix LDO 12 regulator for PM8550
regulator: da9063: better fix null deref with partial DT

+7 -7
+6 -6
drivers/regulator/da9063-regulator.c
··· 778 778 const struct notification_limit *uv_l = &constr->under_voltage_limits; 779 779 const struct notification_limit *ov_l = &constr->over_voltage_limits; 780 780 781 - if (!config->init_data) /* No config in DT, pointers will be invalid */ 782 - return 0; 783 - 784 781 /* make sure that only one severity is used to clarify if unchanged, enabled or disabled */ 785 782 if ((!!uv_l->prot + !!uv_l->err + !!uv_l->warn) > 1) { 786 783 dev_err(config->dev, "%s: at most one voltage monitoring severity allowed!\n", ··· 1028 1031 config.of_node = da9063_reg_matches[id].of_node; 1029 1032 config.regmap = da9063->regmap; 1030 1033 1031 - ret = da9063_check_xvp_constraints(&config); 1032 - if (ret) 1033 - return ret; 1034 + /* Checking constraints requires init_data from DT. */ 1035 + if (config.init_data) { 1036 + ret = da9063_check_xvp_constraints(&config); 1037 + if (ret) 1038 + return ret; 1039 + } 1034 1040 1035 1041 regl->rdev = devm_regulator_register(&pdev->dev, &regl->desc, 1036 1042 &config);
+1 -1
drivers/regulator/qcom-rpmh-regulator.c
··· 1068 1068 RPMH_VREG("ldo9", "ldo%s9", &pmic5_pldo, "vdd-l8-l9"), 1069 1069 RPMH_VREG("ldo10", "ldo%s10", &pmic5_nldo515, "vdd-l1-l4-l10"), 1070 1070 RPMH_VREG("ldo11", "ldo%s11", &pmic5_nldo515, "vdd-l11"), 1071 - RPMH_VREG("ldo12", "ldo%s12", &pmic5_pldo, "vdd-l12"), 1071 + RPMH_VREG("ldo12", "ldo%s12", &pmic5_nldo515, "vdd-l12"), 1072 1072 RPMH_VREG("ldo13", "ldo%s13", &pmic5_pldo, "vdd-l2-l13-l14"), 1073 1073 RPMH_VREG("ldo14", "ldo%s14", &pmic5_pldo, "vdd-l2-l13-l14"), 1074 1074 RPMH_VREG("ldo15", "ldo%s15", &pmic5_nldo515, "vdd-l15"),