diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-01-05 23:10:09 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-01-28 23:24:39 +0100 |
| commit | 6010d40320f8827441414886c46a7dbc6460439a (patch) | |
| tree | 3ed1ef4fb1c52356815f4edb5c891a9187da668c /drivers/pinctrl/pinctrl-nomadik.c | |
| parent | ba785205502f9a03d4ee31bdc3a1228ba5465f00 (diff) | |
| download | blackbird-op-linux-6010d40320f8827441414886c46a7dbc6460439a.tar.gz blackbird-op-linux-6010d40320f8827441414886c46a7dbc6460439a.zip | |
ARM: nomadik: move GPIO and pinctrl to device tree
This moves the instances of the Nomadik pin controller and the
Nomadik GPIO blocks (also handled by the GPIO driver) over to
the device tree. A new compatible string is added to the
pin control driver in the process.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-nomadik.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-nomadik.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index 1bb16ffb4e41..ef21a662b974 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c @@ -1846,6 +1846,10 @@ static struct pinctrl_desc nmk_pinctrl_desc = { static const struct of_device_id nmk_pinctrl_match[] = { { + .compatible = "stericsson,nmk-pinctrl-stn8815", + .data = (void *)PINCTRL_NMK_STN8815, + }, + { .compatible = "stericsson,nmk_pinctrl", .data = (void *)PINCTRL_NMK_DB8500, }, |
