aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-12-09 11:30:20 +0000
committerLuka Perkov <luka@openwrt.org>2013-12-09 11:30:20 +0000
commitc9ee51ad384b9f282f2d623a2fb43462bb4faaf9 (patch)
tree2825a57adacf871d0b2f1748e23a5eef3d7b7606 /target/linux/imx6
parent47d1215dc79716ee970c78e138d092ee0b4d0aa1 (diff)
downloadupstream-c9ee51ad384b9f282f2d623a2fb43462bb4faaf9.tar.gz
upstream-c9ee51ad384b9f282f2d623a2fb43462bb4faaf9.tar.bz2
upstream-c9ee51ad384b9f282f2d623a2fb43462bb4faaf9.zip
imx6: drop upstreamed patch
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 39010
Diffstat (limited to 'target/linux/imx6')
-rw-r--r--target/linux/imx6/patches-3.12/0021-regulator-pfuze100-allow-misprogrammed-ID.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/target/linux/imx6/patches-3.12/0021-regulator-pfuze100-allow-misprogrammed-ID.patch b/target/linux/imx6/patches-3.12/0021-regulator-pfuze100-allow-misprogrammed-ID.patch
deleted file mode 100644
index 8c0a92bb7a..0000000000
--- a/target/linux/imx6/patches-3.12/0021-regulator-pfuze100-allow-misprogrammed-ID.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Tim Harvey <tharvey@gateworks.com>
-Subject: [PATCH] regulator: pfuze100: allow misprogrammed ID
-
-prior to week 08 of 2013 Freescale misprogrammed between 1 and 3% of
-PFUZE1000 parts with a ID=0x8 instead of the expected ID=0x0
-
-Signed-off-by: Tim Harvey <tharvey@gateworks.com>
----
- drivers/regulator/pfuze100-regulator.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
---- a/drivers/regulator/pfuze100-regulator.c
-+++ b/drivers/regulator/pfuze100-regulator.c
-@@ -308,9 +308,15 @@ static int pfuze_identify(struct pfuze_c
- if (ret)
- return ret;
-
-- if (value & 0x0f) {
-- dev_warn(pfuze_chip->dev, "Illegal ID: %x\n", value);
-- return -ENODEV;
-+ switch (value & 0x0f) {
-+ /* Freescale misprogrammed 1-3% of parts prior to week 8 of 2013 as ID=8 */
-+ case 0x8:
-+ dev_info(pfuze_chip->dev, "Assuming misprogrammed ID=0x8");
-+ case 0x0:
-+ break;
-+ default:
-+ dev_warn(pfuze_chip->dev, "Illegal ID: %x\n", value);
-+ return -ENODEV;
- }
-
- ret = regmap_read(pfuze_chip->regmap, PFUZE100_REVID, &value);