[PATCH/RFC,224/390] sh: sh7757: Register PFC platform device

Commit Message

Simon Horman March 29, 2013, 2:42 a.m. UTC

From: Laurent Pinchart <[e-mail]>

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 <[e-mail]>
Acked-by: Linus Walleij <[e-mail]>
Signed-off-by: Simon Horman <[e-mail]>
(cherry picked from commit eb61b772af3678ba5aed5f6c9cc4dc072076b9f7)

Signed-off-by: Simon Horman <[e-mail]>
---
 arch/sh/Kconfig                         |    1 +
 arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

Patch

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 5fda42b..1bcc17a 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -438,6 +438,7 @@  config CPU_SUBTYPE_SH7757
 	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select USB_ARCH_HAS_OHCI
 	select USB_ARCH_HAS_EHCI
+	select PINCTRL
 	help
 	  Select SH7757 if you have a SH4A SH7757 CPU.
 
diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c
index 4a2736d..784b428 100644
--- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c
@@ -16,6 +16,7 @@ 
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <cpu/pfc.h>
 #include <cpu/sh7757.h>
 
 enum {
@@ -2282,6 +2283,6 @@  static struct pinmux_info sh7757_pinmux_info = {
 
 static int __init plat_pinmux_setup(void)
 {
-	return register_pinmux(&sh7757_pinmux_info);
+	return sh_pfc_register_info(NULL, NULL, 0, &sh7757_pinmux_info);
 }
 arch_initcall(plat_pinmux_setup);