aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorLaurent Pinchart2012-12-15 16:51:09 -0600
committerSimon Horman2013-01-24 18:24:24 -0600
commitef97c3c1390aff67c44b61ca4b20d56c4284f38a (patch)
tree3a231e5813a84488b464f6014557e3324d3b4142 /arch/sh
parent85db6bff7e64410b4810c5451ffa3e13ad4e1dab (diff)
downloadam43-linux-kernel-ef97c3c1390aff67c44b61ca4b20d56c4284f38a.tar.gz
am43-linux-kernel-ef97c3c1390aff67c44b61ca4b20d56c4284f38a.tar.xz
am43-linux-kernel-ef97c3c1390aff67c44b61ca4b20d56c4284f38a.zip
sh: sh7722: 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-sh7722.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index bfb8b3ee639..2f0d9bf7b03 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -527,6 +527,7 @@ config CPU_SUBTYPE_SH7722
527 select SYS_SUPPORTS_NUMA 527 select SYS_SUPPORTS_NUMA
528 select SYS_SUPPORTS_CMT 528 select SYS_SUPPORTS_CMT
529 select ARCH_WANT_OPTIONAL_GPIOLIB 529 select ARCH_WANT_OPTIONAL_GPIOLIB
530 select PINCTRL
530 531
531config CPU_SUBTYPE_SH7366 532config CPU_SUBTYPE_SH7366
532 bool "Support SH7366 processor" 533 bool "Support SH7366 processor"
diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c
index 0688a7502f8..11dbce34288 100644
--- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c
@@ -1,6 +1,7 @@
1#include <linux/init.h> 1#include <linux/init.h>
2#include <linux/kernel.h> 2#include <linux/kernel.h>
3#include <linux/gpio.h> 3#include <linux/gpio.h>
4#include <cpu/pfc.h>
4#include <cpu/sh7722.h> 5#include <cpu/sh7722.h>
5 6
6enum { 7enum {
@@ -1778,7 +1779,7 @@ static struct pinmux_info sh7722_pinmux_info = {
1778 1779
1779static int __init plat_pinmux_setup(void) 1780static int __init plat_pinmux_setup(void)
1780{ 1781{
1781 return register_pinmux(&sh7722_pinmux_info); 1782 return sh_pfc_register_info(NULL, NULL, 0, &sh7722_pinmux_info);
1782} 1783}
1783 1784
1784arch_initcall(plat_pinmux_setup); 1785arch_initcall(plat_pinmux_setup);