sh: sh7786: 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>

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 7d5bc1df1a9587b5afa84800acc0cbc50435ac20..27f0b730693229885fe5bc5bc13f25bc9fbdd6b7 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -507,6 +507,7 @@ config CPU_SUBTYPE_SH7786
        select USB_OHCI_SH if USB_OHCI_HCD
        select USB_ARCH_HAS_EHCI
        select USB_EHCI_SH if USB_EHCI_HCD
+       select PINCTRL
 
 config CPU_SUBTYPE_SHX3
        bool "Support SH-X3 processor"

diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c
index 60df99c7bc2600db98fa738a85e1fdf62b5342e4..be876b0f1ad0968a0995a81b30bb953b1059caef 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c
+++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <cpu/pfc.h>
 #include <cpu/sh7786.h>
 
 enum {
@@ -837,7 +838,7 @@ static struct pinmux_info sh7786_pinmux_info = {
 
 static int __init plat_pinmux_setup(void)
 {
-       return register_pinmux(&sh7786_pinmux_info);
+       return sh_pfc_register_info(NULL, NULL, 0, &sh7786_pinmux_info);
 }
 
 arch_initcall(plat_pinmux_setup);