[PATCH 39/80] sh: sh7785: Register PFC platform device
Simon Horman
horms+renesas at verge.net.au
Thu Jan 24 21:24:15 EST 2013
From: Laurent Pinchart <laurent.pinchart+renesas at ideasonboard.com>
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 at ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij at linaro.org>
Signed-off-by: Simon Horman <horms+renesas at verge.net.au>
---
arch/sh/Kconfig | 1 +
arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index c99193f..7d5bc1d 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -494,6 +494,7 @@ config CPU_SUBTYPE_SH7785
select ARCH_SPARSEMEM_ENABLE
select SYS_SUPPORTS_NUMA
select ARCH_WANT_OPTIONAL_GPIOLIB
+ select PINCTRL
config CPU_SUBTYPE_SH7786
bool "Support SH7786 processor"
diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c
index 5ebc25f..da0bd79 100644
--- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c
@@ -11,6 +11,7 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/gpio.h>
+#include <cpu/pfc.h>
#include <cpu/sh7785.h>
enum {
@@ -1304,7 +1305,7 @@ static struct pinmux_info sh7785_pinmux_info = {
static int __init plat_pinmux_setup(void)
{
- return register_pinmux(&sh7785_pinmux_info);
+ return sh_pfc_register_info(NULL, NULL, 0, &sh7785_pinmux_info);
}
arch_initcall(plat_pinmux_setup);
--
1.7.10.4
More information about the linux-arm-kernel
mailing list