diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2012-12-15 23:51:09 +0100 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-25 09:24:24 +0900 |
| commit | ef97c3c1390aff67c44b61ca4b20d56c4284f38a (patch) | |
| tree | 3a231e5813a84488b464f6014557e3324d3b4142 | |
| parent | 85db6bff7e64410b4810c5451ffa3e13ad4e1dab (diff) | |
sh: sh7722: Register PFC platform device
Add arch code to register the PFC platform device instead of calling the
driver directly. Platform device registration in the sh-pfc driver will
be removed.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | arch/sh/Kconfig | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index bfb8b3ee6394..2f0d9bf7b038 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -527,6 +527,7 @@ config CPU_SUBTYPE_SH7722 select SYS_SUPPORTS_NUMA select SYS_SUPPORTS_CMT select ARCH_WANT_OPTIONAL_GPIOLIB + select PINCTRL config CPU_SUBTYPE_SH7366 bool "Support SH7366 processor" diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c index 0688a7502f86..11dbce342884 100644 --- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c @@ -1,6 +1,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/gpio.h> +#include <cpu/pfc.h> #include <cpu/sh7722.h> enum { @@ -1778,7 +1779,7 @@ static struct pinmux_info sh7722_pinmux_info = { static int __init plat_pinmux_setup(void) { - return register_pinmux(&sh7722_pinmux_info); + return sh_pfc_register_info(NULL, NULL, 0, &sh7722_pinmux_info); } arch_initcall(plat_pinmux_setup); |