aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6/patches-3.10/0021-regulator-pfuze100-fix-build-warning-and-correct-the.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-10-29 02:19:03 +0000
committerLuka Perkov <luka@openwrt.org>2013-10-29 02:19:03 +0000
commitf44c65c7c8d57b08c783051a55c7e3eb367e6f7b (patch)
treecd0bf074d3a84802878791a8b4b7bd8d5b0a0faa /target/linux/imx6/patches-3.10/0021-regulator-pfuze100-fix-build-warning-and-correct-the.patch
parent7b7c06d2e3cdd8d54c3a99d2cb0725ecbc07c9d0 (diff)
downloadupstream-f44c65c7c8d57b08c783051a55c7e3eb367e6f7b.tar.gz
upstream-f44c65c7c8d57b08c783051a55c7e3eb367e6f7b.tar.bz2
upstream-f44c65c7c8d57b08c783051a55c7e3eb367e6f7b.zip
imx6: update 3.10 patches
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 38571
Diffstat (limited to 'target/linux/imx6/patches-3.10/0021-regulator-pfuze100-fix-build-warning-and-correct-the.patch')
-rw-r--r--target/linux/imx6/patches-3.10/0021-regulator-pfuze100-fix-build-warning-and-correct-the.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/target/linux/imx6/patches-3.10/0021-regulator-pfuze100-fix-build-warning-and-correct-the.patch b/target/linux/imx6/patches-3.10/0021-regulator-pfuze100-fix-build-warning-and-correct-the.patch
new file mode 100644
index 0000000000..488edb6332
--- /dev/null
+++ b/target/linux/imx6/patches-3.10/0021-regulator-pfuze100-fix-build-warning-and-correct-the.patch
@@ -0,0 +1,35 @@
+From: Robin Gong <b38343@freescale.com>
+Subject: [PATCH] regulator:pfuze100: fix build warning and correct the binding
+ doc
+
+fix building warning and correct the binding doc
+
+Signed-off-by: Robin Gong <b38343@freescale.com>
+Signed-off-by: Mark Brown <broonie@linaro.org>
+---
+ Documentation/devicetree/bindings/regulator/pfuze100.txt | 2 ++
+ drivers/regulator/pfuze100-regulator.c | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- a/Documentation/devicetree/bindings/regulator/pfuze100.txt
++++ b/Documentation/devicetree/bindings/regulator/pfuze100.txt
+@@ -3,6 +3,8 @@ PFUZE100 family of regulators
+ Required properties:
+ - compatible: "fsl,pfuze100"
+ - reg: I2C slave address
++
++Required child node:
+ - regulators: This is the list of child nodes that specify the regulator
+ initialization data for defined regulators. Please refer to below doc
+ Documentation/devicetree/bindings/regulator/regulator.txt.
+--- a/drivers/regulator/pfuze100-regulator.c
++++ b/drivers/regulator/pfuze100-regulator.c
+@@ -295,7 +295,7 @@ static inline struct device_node *match_
+ #else
+ static int pfuze_parse_regulators_dt(struct pfuze_chip *chip)
+ {
+- return NULL;
++ return 0;
+ }
+
+ static inline struct regulator_init_data *match_init_data(int index)