aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2012-12-15 17:51:13 -0500
committerSimon Horman <horms+renesas@verge.net.au>2013-01-24 19:24:25 -0500
commiteb61b772af3678ba5aed5f6c9cc4dc072076b9f7 (patch)
tree5369aff6fa32d9349e7d096cc4b6c49187485691
parent2c17218257dc948a4c0b89de900eab0261ac0f77 (diff)
sh: sh7757: 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-sh7757.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 7a7d2ec7dc53..c99193f68569 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -467,6 +467,7 @@ config CPU_SUBTYPE_SH7757
467 select ARCH_WANT_OPTIONAL_GPIOLIB 467 select ARCH_WANT_OPTIONAL_GPIOLIB
468 select USB_ARCH_HAS_OHCI 468 select USB_ARCH_HAS_OHCI
469 select USB_ARCH_HAS_EHCI 469 select USB_ARCH_HAS_EHCI
470 select PINCTRL
470 help 471 help
471 Select SH7757 if you have a SH4A SH7757 CPU. 472 Select SH7757 if you have a SH4A SH7757 CPU.
472 473
diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c
index 4a2736d52392..784b42895045 100644
--- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.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/sh7757.h> 20#include <cpu/sh7757.h>
20 21
21enum { 22enum {
@@ -2282,6 +2283,6 @@ static struct pinmux_info sh7757_pinmux_info = {
2282 2283
2283static int __init plat_pinmux_setup(void) 2284static int __init plat_pinmux_setup(void)
2284{ 2285{
2285 return register_pinmux(&sh7757_pinmux_info); 2286 return sh_pfc_register_info(NULL, NULL, 0, &sh7757_pinmux_info);
2286} 2287}
2287arch_initcall(plat_pinmux_setup); 2288arch_initcall(plat_pinmux_setup);