From: Luka Perkov <luka@openwrt.org>
Date: Mon, 9 Dec 2013 11:30:20 +0000 (+0000)
Subject: imx6: drop upstreamed patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c9ee51ad384b9f282f2d623a2fb43462bb4faaf9;p=openwrt%2Fstaging%2Flinusw.git

imx6: drop upstreamed patch

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 39010
---

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);