sh: sh7734: 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 18852130af1a30d20c8572b6203fb03e310326d1..7a7d2ec7dc538ce3adf91794ceeb552187c88c9c 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -456,6 +456,7 @@ config CPU_SUBTYPE_SH7734
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select USB_ARCH_HAS_OHCI
        select USB_ARCH_HAS_EHCI
+       select PINCTRL
        help
          Select SH7734 if you have a SH4A SH7734 CPU.
 

diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c
index eed3b9d19d386de1a01d92510fd07a46515e4981..fa3358319443a419157a96ad258601872d29429f 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c
+++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/gpio.h>
 #include <linux/ioport.h>
+#include <cpu/pfc.h>
 #include <cpu/sh7734.h>
 
 #define CPU_32_PORT(fn, pfx, sfx)                              \
@@ -2467,9 +2468,6 @@ static struct resource sh7734_pfc_resources[] = {
 static struct pinmux_info sh7734_pinmux_info = {
        .name = "sh7734_pfc",
 
-       .resource = sh7734_pfc_resources,
-       .num_resources = ARRAY_SIZE(sh7734_pfc_resources),
-
        .unlock_reg = 0xFFFC0000,
 
        .reserved_id = PINMUX_RESERVED,
@@ -2492,6 +2490,8 @@ static struct pinmux_info sh7734_pinmux_info = {
 
 static int __init plat_pinmux_setup(void)
 {
-       return register_pinmux(&sh7734_pinmux_info);
+       return sh_pfc_register_info(NULL, sh7734_pfc_resources,
+                                   ARRAY_SIZE(sh7734_pfc_resources),
+                                   &sh7734_pinmux_info);
 }
 arch_initcall(plat_pinmux_setup);