diff --git a/[refs] b/[refs] index 5ffe598575eb..3659ce227857 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c17218257dc948a4c0b89de900eab0261ac0f77 +refs/heads/master: eb61b772af3678ba5aed5f6c9cc4dc072076b9f7 diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig index 7a7d2ec7dc53..c99193f68569 100644 --- a/trunk/arch/sh/Kconfig +++ b/trunk/arch/sh/Kconfig @@ -467,6 +467,7 @@ config CPU_SUBTYPE_SH7757 select ARCH_WANT_OPTIONAL_GPIOLIB select USB_ARCH_HAS_OHCI select USB_ARCH_HAS_EHCI + select PINCTRL help Select SH7757 if you have a SH4A SH7757 CPU. diff --git a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c index 4a2736d52392..784b42895045 100644 --- a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c +++ b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c @@ -16,6 +16,7 @@ #include #include #include +#include #include enum { @@ -2282,6 +2283,6 @@ static struct pinmux_info sh7757_pinmux_info = { static int __init plat_pinmux_setup(void) { - return register_pinmux(&sh7757_pinmux_info); + return sh_pfc_register_info(NULL, NULL, 0, &sh7757_pinmux_info); } arch_initcall(plat_pinmux_setup);