aboutsummaryrefslogtreecommitdiffstats
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
commite7a7417dafba54453305fd52225a149d37e9899c (patch)
treec9500d2fbca0c257a942bc1b45091c3222392159
parent1432cd56f913bf37950b1141c8c7950792e473bf (diff)
downloadupstream-e7a7417dafba54453305fd52225a149d37e9899c.tar.gz
upstream-e7a7417dafba54453305fd52225a149d37e9899c.tar.bz2
upstream-e7a7417dafba54453305fd52225a149d37e9899c.zip
imx6: drop upstreamed patch
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39010 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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);