diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2012-12-15 23:51:06 +0100 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-25 09:24:24 +0900 |
| commit | 5946e7bb4401b2b8b8803c9193c569613ab1faa2 (patch) | |
| tree | b24c0e8c5561904958ec1a963f0177fcdcc9512c /arch/sh | |
| parent | b768ecbc5129a11a83aff6f3240bc9c728600c98 (diff) | |
| download | linux-3.10-5946e7bb4401b2b8b8803c9193c569613ab1faa2.tar.gz linux-3.10-5946e7bb4401b2b8b8803c9193c569613ab1faa2.tar.bz2 linux-3.10-5946e7bb4401b2b8b8803c9193c569613ab1faa2.zip | |
sh: sh7264: 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>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/Kconfig | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 023b2adead6..0626044bd86 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -297,6 +297,7 @@ config CPU_SUBTYPE_SH7264 select CPU_HAS_FPU select SYS_SUPPORTS_CMT select SYS_SUPPORTS_MTU2 + select PINCTRL config CPU_SUBTYPE_SH7269 bool "Support SH7269 processor" diff --git a/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c b/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c index 79a0d6097f2..ed9fc39daa6 100644 --- a/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c +++ b/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c @@ -11,6 +11,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/gpio.h> +#include <cpu/pfc.h> #include <cpu/sh7264.h> enum { @@ -2131,6 +2132,6 @@ static struct pinmux_info sh7264_pinmux_info = { static int __init plat_pinmux_setup(void) { - return register_pinmux(&sh7264_pinmux_info); + return sh_pfc_register_info(NULL, NULL, 0, &sh7264_pinmux_info); } arch_initcall(plat_pinmux_setup); |