summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Molton <ian.molton@codethink.co.uk>2013-09-02 16:44:55 +0100
committerLinus Walleij <linus.walleij@linaro.org>2013-09-19 15:33:45 +0200
commitb59278548e2383976f7db5fd3389f9116a6f240d (patch)
tree2e1bf6cfbf85210222790f6229b0d295aca7d1d8
parentca6af7b96ab621371f5f408e3fe7bd1e5cb063aa (diff)
downloadlinux-b59278548e2383976f7db5fd3389f9116a6f240d.tar.bz2
emev2: GPIOLIB: Enable support for OF
EMEV2 is now a DT platform, however the GPIO driver cannot be used from a DT file since it does not fill out the of_node field in its gpio_chip structure. Signed-off-by: Ian Molton <ian.molton@codethink.co.uk> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/Kconfig2
-rw-r--r--drivers/gpio/gpio-em.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index b6ed304863eb..a6d67c5d0c20 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -129,7 +129,7 @@ config GPIO_IT8761E
config GPIO_EM
tristate "Emma Mobile GPIO"
- depends on ARM
+ depends on ARM && OF_GPIO
help
Say yes here to support GPIO on Renesas Emma Mobile SoCs.
diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index c6e1f086efe8..160d759170a5 100644
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -319,6 +319,7 @@ static int em_gio_probe(struct platform_device *pdev)
}
gpio_chip = &p->gpio_chip;
+ gpio_chip->of_node = pdev->dev.of_node;
gpio_chip->direction_input = em_gio_direction_input;
gpio_chip->get = em_gio_get;
gpio_chip->direction_output = em_gio_direction_output;