summaryrefslogtreecommitdiff
path: root/drivers/pinctrl/pinctrl-nomadik.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-08-09 22:43:28 (GMT)
committerLinus Walleij <linus.walleij@linaro.org>2012-09-03 11:21:37 (GMT)
commitf79c5ed9dab3ae80f6cbe9edaafbc8a4dadb8408 (patch)
tree7ff9f4063a1ff487758be23cbe8acef272c46c6d /drivers/pinctrl/pinctrl-nomadik.c
parent45a1b53195069f53d5cbdbfff5e5fed97004320b (diff)
downloadlinux-f79c5ed9dab3ae80f6cbe9edaafbc8a4dadb8408.tar.xz
pinctrl/nomadik: add STn8815 ASIC support
This adds support for the STN8815 ASIC for the Nomadik pin controller. Acked-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-nomadik.c')
-rw-r--r--drivers/pinctrl/pinctrl-nomadik.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index 6a5f38c..d12df02 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -1720,6 +1720,8 @@ static int __devinit nmk_pinctrl_probe(struct platform_device *pdev)
of_match_device(nmk_pinctrl_match, &pdev->dev)->data;
/* Poke in other ASIC variants here */
+ if (version == PINCTRL_NMK_STN8815)
+ nmk_pinctrl_stn8815_init(&npct->soc);
if (version == PINCTRL_NMK_DB8500)
nmk_pinctrl_db8500_init(&npct->soc);
if (version == PINCTRL_NMK_DB8540)