releases/4.7.7/regulator-qcom_spmi-add-support-for-s4-supply-on-pm8941.patch

   1 From c333dfe8dba7d3e47e97e1cee3c38123e19ae73c Mon Sep 17 00:00:00 2001
   2 From: Stephen Boyd <stephen.boyd@linaro.org>
   3 Date: Sat, 25 Jun 2016 22:52:11 -0700
   4 Subject: regulator: qcom_spmi: Add support for S4 supply on pm8941
   5
   6 From: Stephen Boyd <stephen.boyd@linaro.org>
   7
   8 commit c333dfe8dba7d3e47e97e1cee3c38123e19ae73c upstream.
   9
  10 The S4 supply is sometimes called the boost regulator because it
  11 outputs 5V. Typically it's connected to the 5vs1 and 5vs2
  12 switches for use in USB OTG and HDMI applications. Add support
  13 for this regulator which was mistakenly left out from the initial
  14 submission of this driver.
  15
  16 Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
  17 Fixes: e92a4047419c ("regulator: Add QCOM SPMI regulator driver")
  18 Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
  19 Signed-off-by: Mark Brown <broonie@kernel.org>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21
  22 ---
  23  Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt |    4 ++--
  24  drivers/regulator/qcom_spmi-regulator.c                             |    1 +
  25  2 files changed, 3 insertions(+), 2 deletions(-)
  26
  27 --- a/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt
  28 +++ b/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt
  29 @@ -113,8 +113,8 @@ pm8916:
  30         l14, l15, l16, l17, l18
  31
  32  pm8941:
  33 -       s1, s2, s3, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11, l12, l13, l14,
  34 -       l15, l16, l17, l18, l19, l20, l21, l22, l23, l24, lvs1, lvs2, lvs3,
  35 +       s1, s2, s3, s4, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11, l12, l13,
  36 +       l14, l15, l16, l17, l18, l19, l20, l21, l22, l23, l24, lvs1, lvs2, lvs3,
  37         mvs1, mvs2
  38
  39  pm8994:
  40 --- a/drivers/regulator/qcom_spmi-regulator.c
  41 +++ b/drivers/regulator/qcom_spmi-regulator.c
  42 @@ -1496,6 +1496,7 @@ static const struct spmi_regulator_data
  43         { "s1", 0x1400, "vdd_s1", },
  44         { "s2", 0x1700, "vdd_s2", },
  45         { "s3", 0x1a00, "vdd_s3", },
  46 +       { "s4", 0xa000, },
  47         { "l1", 0x4000, "vdd_l1_l3", },
  48         { "l2", 0x4100, "vdd_l2_lvs_1_2_3", },
  49         { "l3", 0x4200, "vdd_l1_l3", },