diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2012-12-15 17:51:16 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-24 19:24:25 -0500 |
commit | 3e347f08aab1bee4187fcda482ebde49090c4844 (patch) | |
tree | 0a360eceb904a04cfc338574304921a83ce47555 /arch/sh | |
parent | c0fdbff91b4d7e0a594adbc92964f07d71adf6b2 (diff) |
sh: shx3: 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/Kconfig | 1 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/pinmux-shx3.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 27f0b7306932..c72b6162e233 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -515,6 +515,7 @@ config CPU_SUBTYPE_SHX3 | |||
515 | select CPU_SHX3 | 515 | select CPU_SHX3 |
516 | select GENERIC_CLOCKEVENTS_BROADCAST if SMP | 516 | select GENERIC_CLOCKEVENTS_BROADCAST if SMP |
517 | select ARCH_REQUIRE_GPIOLIB | 517 | select ARCH_REQUIRE_GPIOLIB |
518 | select PINCTRL | ||
518 | 519 | ||
519 | # SH4AL-DSP Processor Support | 520 | # SH4AL-DSP Processor Support |
520 | 521 | ||
diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c b/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c index 2ebb98306425..eef1b8f076b8 100644 --- a/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c +++ b/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
12 | #include <linux/gpio.h> | 12 | #include <linux/gpio.h> |
13 | #include <cpu/pfc.h> | ||
13 | #include <cpu/shx3.h> | 14 | #include <cpu/shx3.h> |
14 | 15 | ||
15 | enum { | 16 | enum { |
@@ -582,6 +583,6 @@ static struct pinmux_info shx3_pinmux_info = { | |||
582 | 583 | ||
583 | static int __init shx3_pinmux_setup(void) | 584 | static int __init shx3_pinmux_setup(void) |
584 | { | 585 | { |
585 | return register_pinmux(&shx3_pinmux_info); | 586 | return sh_pfc_register_info(NULL, NULL, 0, &shx3_pinmux_info); |
586 | } | 587 | } |
587 | arch_initcall(shx3_pinmux_setup); | 588 | arch_initcall(shx3_pinmux_setup); |