sh: shx3: 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 27f0b730693229885fe5bc5bc13f25bc9fbdd6b7..c72b6162e23340afed39c6f7290c2b9d2cb51fb5 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -515,6 +515,7 @@ config CPU_SUBTYPE_SHX3
        select CPU_SHX3
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        select ARCH_REQUIRE_GPIOLIB
+       select PINCTRL
 
 # SH4AL-DSP Processor Support
 

diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c b/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c
index 2ebb983064255d1fb6d9a21841d54042e504228d..eef1b8f076b80d823bf6833d822d2116b67fe9c1 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c
@@ -10,6 +10,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <cpu/pfc.h>
 #include <cpu/shx3.h>
 
 enum {
@@ -582,6 +583,6 @@ static struct pinmux_info shx3_pinmux_info = {
 
 static int __init shx3_pinmux_setup(void)
 {
-       return register_pinmux(&shx3_pinmux_info);
+       return sh_pfc_register_info(NULL, NULL, 0, &shx3_pinmux_info);
 }
 arch_initcall(shx3_pinmux_setup);