From 5946e7bb4401b2b8b8803c9193c569613ab1faa2 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 15 Dec 2012 23:51:06 +0100 Subject: [PATCH] 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 Acked-by: Linus Walleij Signed-off-by: Simon Horman --- arch/sh/Kconfig | 1 + arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 023b2adead62..0626044bd866 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 79a0d6097f29..ed9fc39daa61 100644 --- a/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c +++ b/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c @@ -11,6 +11,7 @@ #include #include #include +#include #include 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); -- 2.20.1