Skip to contentSkip to conversation

Patch "regulator: qcom_spmi: Update mvs1/mvs2 switches on pm8941" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Oct 5, 2016

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

regulator: qcom_spmi: Update mvs1/mvs2 switches on pm8941

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
regulator-qcom_spmi-update-mvs1-mvs2-switches-on-pm8941.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 93bfe79b03365f410aa91caf04263173c008ecdf Mon Sep 17 00:00:00 2001

From: Stephen Boyd <[email protected]>
Date: Sat, 25 Jun 2016 22:52:12 -0700
Subject: regulator: qcom_spmi: Update mvs1/mvs2 switches on pm8941

From: Stephen Boyd <[email protected]>

commit 93bfe79b03365f410aa91caf04263173c008ecdf upstream.

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 <[email protected]>
Fixes e92a4047419c ("regulator: Add QCOM SPMI regulator driver")
---
 Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt |    2 +-
 drivers/regulator/qcom_spmi-regulator.c                             |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt +1 -1
@@ -83,7 +83,7 @@ pm8916:
 pm8941:
 	s1, s2, s3, s4, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11, l12, l13,
 	l14, l15, l16, l17, l18, l19, l20, l21, l22, l23, l24, lvs1, lvs2, lvs3,
-	mvs1, mvs2
+	5vs1, 5vs2
 
 The content of each sub-node is defined by the standard binding for regulators -
 see regulator.txt - with additional custom properties described below:
drivers/regulator/qcom_spmi-regulator.c +2 -2
@@ -1470,8 +1470,8 @@ static const struct spmi_regulator_data
 	{ "lvs1", 0x8000, "vdd_l2_lvs_1_2_3", },
 	{ "lvs2", 0x8100, "vdd_l2_lvs_1_2_3", },
 	{ "lvs3", 0x8200, "vdd_l2_lvs_1_2_3", },
-	{ "mvs1", 0x8300, "vin_5vs", },
-	{ "mvs2", 0x8400, "vin_5vs", },
+	{ "5vs1", 0x8300, "vin_5vs", "ocp-5vs1", },
+	{ "5vs2", 0x8400, "vin_5vs", "ocp-5vs2", },
 	{ }
 };
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/regulator-qcom_spmi-add-support-for-s4-supply-on-pm8941.patch queue-4.4/regulator-qcom_spmi-update-mvs1-mvs2-switches-on-pm8941.patch queue-4.4/regulator-qcom_spmi-add-support-for-get_mode-set_mode-on-switches.patch