summaryrefslogtreecommitdiff
path: root/target/linux/imx6/patches-3.10/0021-regulator-pfuze100-fix-build-warning-and-correct-the.patch
blob: 488edb6332eb0cc5c99fc94ba6712afacfa895b9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
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)