aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2012-12-15 17:51:05 -0500
committerSimon Horman <horms+renesas@verge.net.au>2013-01-24 19:24:23 -0500
commitb768ecbc5129a11a83aff6f3240bc9c728600c98 (patch)
treee24dab7234f3b8ef1d83dfec1d4b1d48d71da12b /arch/sh
parent8fdff1dc26fc0f50be2c64656229efca2e9de8c5 (diff)
sh: sh7203: 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/sh2a/pinmux-sh7203.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index babc2b826c5c..023b2adead62 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -276,6 +276,7 @@ config CPU_SUBTYPE_SH7203
276 select SYS_SUPPORTS_CMT 276 select SYS_SUPPORTS_CMT
277 select SYS_SUPPORTS_MTU2 277 select SYS_SUPPORTS_MTU2
278 select ARCH_WANT_OPTIONAL_GPIOLIB 278 select ARCH_WANT_OPTIONAL_GPIOLIB
279 select PINCTRL
279 280
280config CPU_SUBTYPE_SH7206 281config CPU_SUBTYPE_SH7206
281 bool "Support SH7206 processor" 282 bool "Support SH7206 processor"
diff --git a/arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c b/arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c
index c465af7283fc..814926e1895e 100644
--- a/arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/pinmux-sh7203.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/sh7203.h> 15#include <cpu/sh7203.h>
15 16
16enum { 17enum {
@@ -1592,6 +1593,6 @@ static struct pinmux_info sh7203_pinmux_info = {
1592 1593
1593static int __init plat_pinmux_setup(void) 1594static int __init plat_pinmux_setup(void)
1594{ 1595{
1595 return register_pinmux(&sh7203_pinmux_info); 1596 return sh_pfc_register_info(NULL, NULL, 0, &sh7203_pinmux_info);
1596} 1597}
1597arch_initcall(plat_pinmux_setup); 1598arch_initcall(plat_pinmux_setup);