aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2012-12-15 17:51:14 -0500
committerSimon Horman <horms+renesas@verge.net.au>2013-01-24 19:24:25 -0500
commit77bd27b240a517f3fa218d672cac1906b7e3a448 (patch)
tree5c0ae26c723d892ce9576600329f882a18652d1e
parenteb61b772af3678ba5aed5f6c9cc4dc072076b9f7 (diff)
sh: sh7785: 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>
-rw-r--r--arch/sh/Kconfig1
-rw-r--r--arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index c99193f68569..7d5bc1df1a95 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -494,6 +494,7 @@ config CPU_SUBTYPE_SH7785
494 select ARCH_SPARSEMEM_ENABLE 494 select ARCH_SPARSEMEM_ENABLE
495 select SYS_SUPPORTS_NUMA 495 select SYS_SUPPORTS_NUMA
496 select ARCH_WANT_OPTIONAL_GPIOLIB 496 select ARCH_WANT_OPTIONAL_GPIOLIB
497 select PINCTRL
497 498
498config CPU_SUBTYPE_SH7786 499config CPU_SUBTYPE_SH7786
499 bool "Support SH7786 processor" 500 bool "Support SH7786 processor"
diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c
index 5ebc25fd9b2a..da0bd79c49bf 100644
--- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c
@@ -11,6 +11,7 @@
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/kernel.h> 12#include <linux/kernel.h>
13#include <linux/gpio.h> 13#include <linux/gpio.h>
14#include <cpu/pfc.h>
14#include <cpu/sh7785.h> 15#include <cpu/sh7785.h>
15 16
16enum { 17enum {
@@ -1304,7 +1305,7 @@ static struct pinmux_info sh7785_pinmux_info = {
1304 1305
1305static int __init plat_pinmux_setup(void) 1306static int __init plat_pinmux_setup(void)
1306{ 1307{
1307 return register_pinmux(&sh7785_pinmux_info); 1308 return sh_pfc_register_info(NULL, NULL, 0, &sh7785_pinmux_info);
1308} 1309}
1309 1310
1310arch_initcall(plat_pinmux_setup); 1311arch_initcall(plat_pinmux_setup);