aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 bfb8b3ee6394..2f0d9bf7b038 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 0688a7502f86..11dbce342884 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);