delete queue-3.10/regulator-arizona-ldo1-correct-default-regulator-init_data.patch

diff --git a/queue-3.10/regulator-arizona-ldo1-correct-default-regulator-init_data.patch b/queue-3.10/regulator-arizona-ldo1-correct-default-regulator-init_data.patch
deleted file mode 100644 (file)
index a36cfd2..0000000
--- a/queue-3.10/regulator-arizona-ldo1-correct-default-regulator-init_data.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a35ff2861690eaf9dbb38fa744a8a9e6f4ebfd61 Mon Sep 17 00:00:00 2001
-From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
-Date: Tue, 18 Mar 2014 10:49:17 +0000
-Subject: regulator: arizona-ldo1: Correct default regulator init_data
-
-From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
-
-commit a35ff2861690eaf9dbb38fa744a8a9e6f4ebfd61 upstream.
-
-Both 5102 and 8997 have the regulator capable of supplying 1.8V, and the
-voltage step from the 5110 regulator is different from what is specified
-in the default description. This patch updates the default regulator
-description to match 5110 and selects the 1.8V capable description for
-8997.
-
-Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
-Signed-off-by: Mark Brown <broonie@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/regulator/arizona-ldo1.c |    7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
---- a/drivers/regulator/arizona-ldo1.c
-+++ b/drivers/regulator/arizona-ldo1.c
-@@ -153,11 +153,9 @@ static const struct regulator_desc arizo
- 
-       .vsel_reg = ARIZONA_LDO1_CONTROL_1,
-       .vsel_mask = ARIZONA_LDO1_VSEL_MASK,
--      .bypass_reg = ARIZONA_LDO1_CONTROL_1,
--      .bypass_mask = ARIZONA_LDO1_BYPASS,
-       .min_uV = 900000,
--      .uV_step = 50000,
--      .n_voltages = 7,
-+      .uV_step = 25000,
-+      .n_voltages = 13,
-       .enable_time = 500,
- 
-       .owner = THIS_MODULE,
-@@ -203,6 +201,7 @@ static int arizona_ldo1_probe(struct pla
-        */
-       switch (arizona->type) {
-       case WM5102:
-+      case WM8997:
-               desc = &arizona_ldo1_hc;
-               ldo1->init_data = arizona_ldo1_dvfs;
-               break;

diff --git a/queue-3.10/series b/queue-3.10/series
index 17e2676fc50376d75013aa73ab54b77e700df934..52bd7e917728df7c652da5416b5f743f71f2eddb 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -35,5 +35,4 @@ staging-r8712u-fix-case-where-ethtype-was-never-obtained-and-always-be-checked-a
 xfs-fix-directory-hash-ordering-bug.patch
 ftrace-x86-one-more-missing-sync-after-fixup-of-function-modification-failure.patch
 x86-64-modify_ldt-ban-16-bit-segments-on-64-bit-kernels.patch
-regulator-arizona-ldo1-correct-default-regulator-init_data.patch
 usb-fix-crash-during-hotplug-of-pci-usb-controller-card.patch