lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 049/159] regulator: qcom_rpm: Fix circular deferral regression
    Date
    From: Linus Walleij <linus.walleij@linaro.org>

    commit 8478ed5844588703a1a4c96a004b1525fbdbdd5e upstream.

    On recent kernels, the PM8058 L16 (or any other PM8058 LDO-regulator)
    does not come up if they are supplied by an SMPS-regulator. This
    is not very strange since the regulators are registered in a long
    array and the L-regulators are registered before the S-regulators,
    and if an L-regulator defers, it will never get around to registering
    the S-regulator that it needs.

    See arch/arm/boot/dts/qcom-apq8060-dragonboard.dts:

    pm8058-regulators {
    (...)
    vdd_l13_l16-supply = <&pm8058_s4>;
    (...)

    Ooops.

    Fix this by moving the PM8058 S-regulators first in the array.

    Do the same for the PM8901 S-regulators (though this is currently
    not causing any problems with out device trees) so that the pattern
    of registration order is the same on all PMnnnn chips.

    Fixes: 087a1b5cdd55 ("regulator: qcom: Rework to single platform device")
    Cc: stable@vger.kernel.org
    Cc: Andy Gross <agross@kernel.org>
    Cc: Bjorn Andersson <andersson@kernel.org>
    Cc: Konrad Dybcio <konrad.dybcio@somainline.org>
    Cc: linux-arm-msm@vger.kernel.org
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Link: https://lore.kernel.org/r/20220909112529.239143-1-linus.walleij@linaro.org
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/regulator/qcom_rpm-regulator.c | 24 ++++++++++++------------
    1 file changed, 12 insertions(+), 12 deletions(-)

    --- a/drivers/regulator/qcom_rpm-regulator.c
    +++ b/drivers/regulator/qcom_rpm-regulator.c
    @@ -820,6 +820,12 @@ static const struct rpm_regulator_data r
    };

    static const struct rpm_regulator_data rpm_pm8058_regulators[] = {
    + { "s0", QCOM_RPM_PM8058_SMPS0, &pm8058_smps, "vdd_s0" },
    + { "s1", QCOM_RPM_PM8058_SMPS1, &pm8058_smps, "vdd_s1" },
    + { "s2", QCOM_RPM_PM8058_SMPS2, &pm8058_smps, "vdd_s2" },
    + { "s3", QCOM_RPM_PM8058_SMPS3, &pm8058_smps, "vdd_s3" },
    + { "s4", QCOM_RPM_PM8058_SMPS4, &pm8058_smps, "vdd_s4" },
    +
    { "l0", QCOM_RPM_PM8058_LDO0, &pm8058_nldo, "vdd_l0_l1_lvs" },
    { "l1", QCOM_RPM_PM8058_LDO1, &pm8058_nldo, "vdd_l0_l1_lvs" },
    { "l2", QCOM_RPM_PM8058_LDO2, &pm8058_pldo, "vdd_l2_l11_l12" },
    @@ -847,12 +853,6 @@ static const struct rpm_regulator_data r
    { "l24", QCOM_RPM_PM8058_LDO24, &pm8058_nldo, "vdd_l23_l24_l25" },
    { "l25", QCOM_RPM_PM8058_LDO25, &pm8058_nldo, "vdd_l23_l24_l25" },

    - { "s0", QCOM_RPM_PM8058_SMPS0, &pm8058_smps, "vdd_s0" },
    - { "s1", QCOM_RPM_PM8058_SMPS1, &pm8058_smps, "vdd_s1" },
    - { "s2", QCOM_RPM_PM8058_SMPS2, &pm8058_smps, "vdd_s2" },
    - { "s3", QCOM_RPM_PM8058_SMPS3, &pm8058_smps, "vdd_s3" },
    - { "s4", QCOM_RPM_PM8058_SMPS4, &pm8058_smps, "vdd_s4" },
    -
    { "lvs0", QCOM_RPM_PM8058_LVS0, &pm8058_switch, "vdd_l0_l1_lvs" },
    { "lvs1", QCOM_RPM_PM8058_LVS1, &pm8058_switch, "vdd_l0_l1_lvs" },

    @@ -861,6 +861,12 @@ static const struct rpm_regulator_data r
    };

    static const struct rpm_regulator_data rpm_pm8901_regulators[] = {
    + { "s0", QCOM_RPM_PM8901_SMPS0, &pm8901_ftsmps, "vdd_s0" },
    + { "s1", QCOM_RPM_PM8901_SMPS1, &pm8901_ftsmps, "vdd_s1" },
    + { "s2", QCOM_RPM_PM8901_SMPS2, &pm8901_ftsmps, "vdd_s2" },
    + { "s3", QCOM_RPM_PM8901_SMPS3, &pm8901_ftsmps, "vdd_s3" },
    + { "s4", QCOM_RPM_PM8901_SMPS4, &pm8901_ftsmps, "vdd_s4" },
    +
    { "l0", QCOM_RPM_PM8901_LDO0, &pm8901_nldo, "vdd_l0" },
    { "l1", QCOM_RPM_PM8901_LDO1, &pm8901_pldo, "vdd_l1" },
    { "l2", QCOM_RPM_PM8901_LDO2, &pm8901_pldo, "vdd_l2" },
    @@ -869,12 +875,6 @@ static const struct rpm_regulator_data r
    { "l5", QCOM_RPM_PM8901_LDO5, &pm8901_pldo, "vdd_l5" },
    { "l6", QCOM_RPM_PM8901_LDO6, &pm8901_pldo, "vdd_l6" },

    - { "s0", QCOM_RPM_PM8901_SMPS0, &pm8901_ftsmps, "vdd_s0" },
    - { "s1", QCOM_RPM_PM8901_SMPS1, &pm8901_ftsmps, "vdd_s1" },
    - { "s2", QCOM_RPM_PM8901_SMPS2, &pm8901_ftsmps, "vdd_s2" },
    - { "s3", QCOM_RPM_PM8901_SMPS3, &pm8901_ftsmps, "vdd_s3" },
    - { "s4", QCOM_RPM_PM8901_SMPS4, &pm8901_ftsmps, "vdd_s4" },
    -
    { "lvs0", QCOM_RPM_PM8901_LVS0, &pm8901_switch, "lvs0_in" },
    { "lvs1", QCOM_RPM_PM8901_LVS1, &pm8901_switch, "lvs1_in" },
    { "lvs2", QCOM_RPM_PM8901_LVS2, &pm8901_switch, "lvs2_in" },

    \
     
     \ /
      Last update: 2022-10-24 13:49    [W:4.547 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site