diff options
| author | Robin Gong <b38343@freescale.com> | 2013-07-26 10:27:18 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-26 19:06:48 +0100 |
| commit | 205c97bcb8773f31184aedd86e229c95fffb179a (patch) | |
| tree | 86ecbfc6dc5c05c8d2cd51bc54b48aa611fdb19f | |
| parent | 3784b6d64dc52ed3fbebad61a85ab9b7a687a167 (diff) | |
| download | blackbird-obmc-linux-205c97bcb8773f31184aedd86e229c95fffb179a.tar.gz blackbird-obmc-linux-205c97bcb8773f31184aedd86e229c95fffb179a.zip | |
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>
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/pfuze100.txt | 2 | ||||
| -rw-r--r-- | drivers/regulator/pfuze100-regulator.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/regulator/pfuze100.txt b/Documentation/devicetree/bindings/regulator/pfuze100.txt index 22e1a48f7e83..fc989b2e8057 100644 --- 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. diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c index fcc7cd0d25cc..e2f9dcf3eb21 100644 --- a/drivers/regulator/pfuze100-regulator.c +++ b/drivers/regulator/pfuze100-regulator.c @@ -295,7 +295,7 @@ static inline struct device_node *match_of_node(int index) #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) |
