diff options
author | Lee Jones <lee.jones@linaro.org> | 2012-06-14 12:27:56 +0200 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2012-07-13 10:14:39 +0200 |
commit | 612e1d5f1c192996889038598fb82ea03fb01573 (patch) | |
tree | 21272007353bd34851e6475f55cfd4e48471acbf | |
parent | ARM: ux500: Move rtc-pl031 registration to Device Tree when enabled (diff) | |
download | linux-612e1d5f1c192996889038598fb82ea03fb01573.tar.xz linux-612e1d5f1c192996889038598fb82ea03fb01573.zip |
pinctrl: pinctrl-nomadik: Append sleepmode property with vendor specific prefixes
Any non-standard property should contain the vendor's identifier which
should be perpended onto the property name followed by a comma. This
aids in name-space collision prevention. This patch ensures the
sleepmode property adheres to the rules.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio-nmk.txt | 2 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-nomadik.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/gpio/gpio-nmk.txt b/Documentation/devicetree/bindings/gpio/gpio-nmk.txt index ee87467ad8d6..8315ac7780ef 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-nmk.txt +++ b/Documentation/devicetree/bindings/gpio/gpio-nmk.txt @@ -26,6 +26,6 @@ Example: #gpio-cells = <2>; gpio-controller; interrupt-controller; - supports-sleepmode; + st,supports-sleepmode; gpio-bank = <1>; }; diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index 3e7e47d6b385..dd9e6f26416d 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c @@ -1198,7 +1198,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev) if (!pdata) return -ENOMEM; - if (of_get_property(np, "supports-sleepmode", NULL)) + if (of_get_property(np, "st,supports-sleepmode", NULL)) pdata->supports_sleepmode = true; if (of_property_read_u32(np, "gpio-bank", &dev->id)) { |