summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej Purski <m.purski@samsung.com>2017-09-05 15:50:27 +0200
committerLee Jones <lee.jones@linaro.org>2017-10-13 10:42:58 +0100
commit4589515af30005a404bd34e4b7933f98e68849f4 (patch)
tree4025d481fa8c60b81a8e3593880bcc96d311c68d
parent223fd9f61f84ee4dd08fb859f2de3f70cc3879f1 (diff)
downloadlinux-stable-4589515af30005a404bd34e4b7933f98e68849f4.tar.gz
linux-stable-4589515af30005a404bd34e4b7933f98e68849f4.tar.bz2
linux-stable-4589515af30005a404bd34e4b7933f98e68849f4.zip
mfd: max77693: Add muic of_compatible in mfd_cell
This patch adds muic of_compatible in order to use the muic device driver in device tree. Signed-off-by: Maciej Purski <m.purski@samsung.com> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--Documentation/devicetree/bindings/mfd/max77693.txt6
-rw-r--r--drivers/mfd/max77693.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mfd/max77693.txt b/Documentation/devicetree/bindings/mfd/max77693.txt
index 6a1ae3a2b77f..e6754974a745 100644
--- a/Documentation/devicetree/bindings/mfd/max77693.txt
+++ b/Documentation/devicetree/bindings/mfd/max77693.txt
@@ -127,6 +127,12 @@ Required properties for the LED child node:
Optional properties for the LED child node:
- label : see Documentation/devicetree/bindings/leds/common.txt
+Optional nodes:
+- max77693-muic :
+ Node used only by extcon consumers.
+ Required properties:
+ - compatible : "maxim,max77693-muic"
+
Example:
#include <dt-bindings/leds/common.h>
diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
index 662ae0d9e334..1c05ea0cba61 100644
--- a/drivers/mfd/max77693.c
+++ b/drivers/mfd/max77693.c
@@ -48,7 +48,10 @@ static const struct mfd_cell max77693_devs[] = {
.name = "max77693-charger",
.of_compatible = "maxim,max77693-charger",
},
- { .name = "max77693-muic", },
+ {
+ .name = "max77693-muic",
+ .of_compatible = "maxim,max77693-muic",
+ },
{
.name = "max77693-haptic",
.of_compatible = "maxim,max77693-haptic",