From ef97c3c1390aff67c44b61ca4b20d56c4284f38a Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 15 Dec 2012 23:51:09 +0100 Subject: [PATCH] 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 Acked-by: Linus Walleij Signed-off-by: Simon Horman --- arch/sh/Kconfig | 1 + arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index bfb8b3e..2f0d9bf 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 0688a75..11dbce3 100644 --- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c @@ -1,6 +1,7 @@ #include #include #include +#include #include 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); -- 2.7.4