aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2012-12-15 17:51:11 -0500
committerSimon Horman <horms+renesas@verge.net.au>2013-01-24 19:24:24 -0500
commit18ebd2288419952fe908aa78ccf531f12d0ddfd8 (patch)
tree89c161f383efeb3dfd3fbbc4a76ae8deda6d0ce5 /arch/sh
parent16941a892ae0d40ad0f2053d80d4c1362e540946 (diff)
sh: sh7724: 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>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/Kconfig1
-rw-r--r--arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 89fb594debb8..18852130af1a 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -445,6 +445,7 @@ config CPU_SUBTYPE_SH7724
445 select ARCH_SPARSEMEM_ENABLE 445 select ARCH_SPARSEMEM_ENABLE
446 select SYS_SUPPORTS_CMT 446 select SYS_SUPPORTS_CMT
447 select ARCH_WANT_OPTIONAL_GPIOLIB 447 select ARCH_WANT_OPTIONAL_GPIOLIB
448 select PINCTRL
448 help 449 help
449 Select SH7724 if you have an SH-MobileR2R CPU. 450 Select SH7724 if you have an SH-MobileR2R CPU.
450 451
diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c
index 1af0f9586379..51000f9a940f 100644
--- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c
@@ -16,6 +16,7 @@
16#include <linux/init.h> 16#include <linux/init.h>
17#include <linux/kernel.h> 17#include <linux/kernel.h>
18#include <linux/gpio.h> 18#include <linux/gpio.h>
19#include <cpu/pfc.h>
19#include <cpu/sh7724.h> 20#include <cpu/sh7724.h>
20 21
21enum { 22enum {
@@ -2225,6 +2226,6 @@ static struct pinmux_info sh7724_pinmux_info = {
2225 2226
2226static int __init plat_pinmux_setup(void) 2227static int __init plat_pinmux_setup(void)
2227{ 2228{
2228 return register_pinmux(&sh7724_pinmux_info); 2229 return sh_pfc_register_info(NULL, NULL, 0, &sh7724_pinmux_info);
2229} 2230}
2230arch_initcall(plat_pinmux_setup); 2231arch_initcall(plat_pinmux_setup);