summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-imx-3.10.17/0005-regulator-pfuze100-Add-PFUZE200-support-to-Kconfig-a.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel/linux/linux-imx-3.10.17/0005-regulator-pfuze100-Add-PFUZE200-support-to-Kconfig-a.patch')
-rw-r--r--recipes-kernel/linux/linux-imx-3.10.17/0005-regulator-pfuze100-Add-PFUZE200-support-to-Kconfig-a.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/recipes-kernel/linux/linux-imx-3.10.17/0005-regulator-pfuze100-Add-PFUZE200-support-to-Kconfig-a.patch b/recipes-kernel/linux/linux-imx-3.10.17/0005-regulator-pfuze100-Add-PFUZE200-support-to-Kconfig-a.patch
deleted file mode 100644
index 7fcc79d..0000000
--- a/recipes-kernel/linux/linux-imx-3.10.17/0005-regulator-pfuze100-Add-PFUZE200-support-to-Kconfig-a.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 2610dd3d4f0f167b77c4ce24e1756f7434a17cde Mon Sep 17 00:00:00 2001
2From: Axel Lin <axel.lin@ingics.com>
3Date: Wed, 5 Mar 2014 18:02:43 +0800
4Subject: [PATCH 05/10] regulator: pfuze100: Add PFUZE200 support to Kconfig
5 and module description
6Organization: O.S. Systems Software LTDA.
7
8Signed-off-by: Axel Lin <axel.lin@ingics.com>
9Acked-by: Robin Gong <b38343@freescale.com>
10Signed-off-by: Mark Brown <broonie@linaro.org>
11(cherry picked from commit 2cee2121db44cfeee206d0854bedd52344eea444)
12
13Signed-off-by: Robin Gong <b38343@freescale.com>
14(cherry picked from commit 88236aaba4ed9b89a7873b30fc1ca9cdcb6b407d)
15
16Upstream-Status: Pending
17---
18 drivers/regulator/Kconfig | 6 +++---
19 drivers/regulator/pfuze100-regulator.c | 2 +-
20 2 files changed, 4 insertions(+), 4 deletions(-)
21
22diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
23index 1339404..5b64f2c 100644
24--- a/drivers/regulator/Kconfig
25+++ b/drivers/regulator/Kconfig
26@@ -305,12 +305,12 @@ config REGULATOR_PCF50633
27 on PCF50633
28
29 config REGULATOR_PFUZE100
30- tristate "Support regulators on Freescale PFUZE100 PMIC"
31+ tristate "Freescale PFUZE100/PFUZE200 regulator driver"
32 depends on I2C
33 select REGMAP_I2C
34 help
35- Say y here to support the regulators found on the Freescale PFUZE100
36- PMIC.
37+ Say y here to support the regulators found on the Freescale
38+ PFUZE100/PFUZE200 PMIC.
39
40 config REGULATOR_RC5T583
41 tristate "RICOH RC5T583 Power regulators"
42diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
43index 0f4924e0..21114f7 100644
44--- a/drivers/regulator/pfuze100-regulator.c
45+++ b/drivers/regulator/pfuze100-regulator.c
46@@ -535,6 +535,6 @@ static struct i2c_driver pfuze_driver = {
47 module_i2c_driver(pfuze_driver);
48
49 MODULE_AUTHOR("Robin Gong <b38343@freescale.com>");
50-MODULE_DESCRIPTION("Regulator Driver for Freescale PFUZE100 PMIC");
51+MODULE_DESCRIPTION("Regulator Driver for Freescale PFUZE100/PFUZE200 PMIC");
52 MODULE_LICENSE("GPL v2");
53 MODULE_ALIAS("i2c:pfuze100-regulator");
54--
552.1.0
56