diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2012-12-15 23:51:16 +0100 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-25 09:24:25 +0900 |
| commit | 3e347f08aab1bee4187fcda482ebde49090c4844 (patch) | |
| tree | 0a360eceb904a04cfc338574304921a83ce47555 | |
| parent | c0fdbff91b4d7e0a594adbc92964f07d71adf6b2 (diff) | |
| download | op-kernel-dev-3e347f08aab1bee4187fcda482ebde49090c4844.zip op-kernel-dev-3e347f08aab1bee4187fcda482ebde49090c4844.tar.gz | |
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>
| -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 27f0b73..c72b616 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -515,6 +515,7 @@ config CPU_SUBTYPE_SHX3 select CPU_SHX3 select GENERIC_CLOCKEVENTS_BROADCAST if SMP select ARCH_REQUIRE_GPIOLIB + select PINCTRL # SH4AL-DSP Processor Support diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c b/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c index 2ebb983..eef1b8f 100644 --- a/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c +++ b/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c @@ -10,6 +10,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/gpio.h> +#include <cpu/pfc.h> #include <cpu/shx3.h> enum { @@ -582,6 +583,6 @@ static struct pinmux_info shx3_pinmux_info = { static int __init shx3_pinmux_setup(void) { - return register_pinmux(&shx3_pinmux_info); + return sh_pfc_register_info(NULL, NULL, 0, &shx3_pinmux_info); } arch_initcall(shx3_pinmux_setup); |
