diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2012-12-15 23:51:07 +0100 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-25 09:24:24 +0900 |
| commit | fb872fcc71ee36060e8506eb089c93079880843a (patch) | |
| tree | b43c9cd617eae9cfa7baaf85ed9a1a447923d889 | |
| parent | 5946e7bb4401b2b8b8803c9193c569613ab1faa2 (diff) | |
sh: sh7269: 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/sh2a/pinmux-sh7269.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 0626044bd866..b934d7d00c7b 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -305,6 +305,7 @@ config CPU_SUBTYPE_SH7269 select CPU_HAS_FPU select SYS_SUPPORTS_CMT select SYS_SUPPORTS_MTU2 + select PINCTRL config CPU_SUBTYPE_MXG bool "Support MX-G processor" diff --git a/arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c b/arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c index 1289fd922c72..525da4cc83c3 100644 --- a/arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c +++ b/arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c @@ -12,6 +12,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/gpio.h> +#include <cpu/pfc.h> #include <cpu/sh7269.h> enum { @@ -2834,6 +2835,6 @@ static struct pinmux_info sh7269_pinmux_info = { static int __init plat_pinmux_setup(void) { - return register_pinmux(&sh7269_pinmux_info); + return sh_pfc_register_info(NULL, NULL, 0, &sh7269_pinmux_info); } arch_initcall(plat_pinmux_setup); |