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

regulator: qcom_spmi: Update mvs1/mvs2 switches on pm8941

The mvs1 and mvs2 switches are actually called 5vs1 and 5vs2 on
some datasheets. Let's rename them to match the datasheets and
also match the RPM based regulator driver which calls these by
their 5vs names (see qcom_smd-regulator.c). There aren't any
users of these regulators so far, so there aren't any concerns of
DT ABI breakage here. While we're here making updates to the
switches, also mandate usage of the OCP irq for these switches
too.

Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Fixes: e92a4047419c ("regulator: Add QCOM SPMI regulator driver")
Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Stephen Boyd and committed by
Mark Brown
93bfe79b c333dfe8

+3 -3
+1 -1
Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt
··· 115 115 pm8941: 116 116 s1, s2, s3, s4, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11, l12, l13, 117 117 l14, l15, l16, l17, l18, l19, l20, l21, l22, l23, l24, lvs1, lvs2, lvs3, 118 - mvs1, mvs2 118 + 5vs1, 5vs2 119 119 120 120 pm8994: 121 121 s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, l1, l2, l3, l4, l5,
+2 -2
drivers/regulator/qcom_spmi-regulator.c
··· 1524 1524 { "lvs1", 0x8000, "vdd_l2_lvs_1_2_3", }, 1525 1525 { "lvs2", 0x8100, "vdd_l2_lvs_1_2_3", }, 1526 1526 { "lvs3", 0x8200, "vdd_l2_lvs_1_2_3", }, 1527 - { "mvs1", 0x8300, "vin_5vs", }, 1528 - { "mvs2", 0x8400, "vin_5vs", }, 1527 + { "5vs1", 0x8300, "vin_5vs", "ocp-5vs1", }, 1528 + { "5vs2", 0x8400, "vin_5vs", "ocp-5vs2", }, 1529 1529 { } 1530 1530 }; 1531 1531