Commit f79c5ed9 authored by Linus Walleij's avatar Linus Walleij

pinctrl/nomadik: add STn8815 ASIC support

This adds support for the STN8815 ASIC for the Nomadik pin
controller.
Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Linus Walleij's avatarLinus Walleij <linus.walleij@linaro.org>
parent 45a1b531
...@@ -86,6 +86,10 @@ config PINCTRL_NOMADIK ...@@ -86,6 +86,10 @@ config PINCTRL_NOMADIK
select PINMUX select PINMUX
select PINCONF select PINCONF
config PINCTRL_STN8815
bool "STN8815 pin controller driver"
depends on PINCTRL_NOMADIK && ARCH_NOMADIK
config PINCTRL_DB8500 config PINCTRL_DB8500
bool "DB8500 pin controller driver" bool "DB8500 pin controller driver"
depends on PINCTRL_NOMADIK && ARCH_U8500 depends on PINCTRL_NOMADIK && ARCH_U8500
......
...@@ -19,6 +19,7 @@ obj-$(CONFIG_PINCTRL_MXS) += pinctrl-mxs.o ...@@ -19,6 +19,7 @@ obj-$(CONFIG_PINCTRL_MXS) += pinctrl-mxs.o
obj-$(CONFIG_PINCTRL_IMX23) += pinctrl-imx23.o obj-$(CONFIG_PINCTRL_IMX23) += pinctrl-imx23.o
obj-$(CONFIG_PINCTRL_IMX28) += pinctrl-imx28.o obj-$(CONFIG_PINCTRL_IMX28) += pinctrl-imx28.o
obj-$(CONFIG_PINCTRL_NOMADIK) += pinctrl-nomadik.o obj-$(CONFIG_PINCTRL_NOMADIK) += pinctrl-nomadik.o
obj-$(CONFIG_PINCTRL_STN8815) += pinctrl-nomadik-stn8815.o
obj-$(CONFIG_PINCTRL_DB8500) += pinctrl-nomadik-db8500.o obj-$(CONFIG_PINCTRL_DB8500) += pinctrl-nomadik-db8500.o
obj-$(CONFIG_PINCTRL_DB8540) += pinctrl-nomadik-db8540.o obj-$(CONFIG_PINCTRL_DB8540) += pinctrl-nomadik-db8540.o
obj-$(CONFIG_PINCTRL_PXA168) += pinctrl-pxa168.o obj-$(CONFIG_PINCTRL_PXA168) += pinctrl-pxa168.o
......
This diff is collapsed.
...@@ -1720,6 +1720,8 @@ static int __devinit nmk_pinctrl_probe(struct platform_device *pdev) ...@@ -1720,6 +1720,8 @@ static int __devinit nmk_pinctrl_probe(struct platform_device *pdev)
of_match_device(nmk_pinctrl_match, &pdev->dev)->data; of_match_device(nmk_pinctrl_match, &pdev->dev)->data;
/* Poke in other ASIC variants here */ /* Poke in other ASIC variants here */
if (version == PINCTRL_NMK_STN8815)
nmk_pinctrl_stn8815_init(&npct->soc);
if (version == PINCTRL_NMK_DB8500) if (version == PINCTRL_NMK_DB8500)
nmk_pinctrl_db8500_init(&npct->soc); nmk_pinctrl_db8500_init(&npct->soc);
if (version == PINCTRL_NMK_DB8540) if (version == PINCTRL_NMK_DB8540)
......
...@@ -62,6 +62,19 @@ struct nmk_pinctrl_soc_data { ...@@ -62,6 +62,19 @@ struct nmk_pinctrl_soc_data {
unsigned ngroups; unsigned ngroups;
}; };
#ifdef CONFIG_PINCTRL_STN8815
void nmk_pinctrl_stn8815_init(const struct nmk_pinctrl_soc_data **soc);
#else
static inline void
nmk_pinctrl_stn8815_init(const struct nmk_pinctrl_soc_data **soc)
{
}
#endif
#ifdef CONFIG_PINCTRL_DB8500 #ifdef CONFIG_PINCTRL_DB8500
void nmk_pinctrl_db8500_init(const struct nmk_pinctrl_soc_data **soc); void nmk_pinctrl_db8500_init(const struct nmk_pinctrl_soc_data **soc);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment