diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2012-12-15 23:51:14 +0100 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-25 09:24:25 +0900 |
| commit | 77bd27b240a517f3fa218d672cac1906b7e3a448 (patch) | |
| tree | 5c0ae26c723d892ce9576600329f882a18652d1e /arch | |
| parent | eb61b772af3678ba5aed5f6c9cc4dc072076b9f7 (diff) | |
| download | blackbird-op-linux-77bd27b240a517f3fa218d672cac1906b7e3a448.tar.gz blackbird-op-linux-77bd27b240a517f3fa218d672cac1906b7e3a448.zip | |
sh: sh7785: 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')
| -rw-r--r-- | arch/sh/Kconfig | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index c99193f68569..7d5bc1df1a95 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 5ebc25fd9b2a..da0bd79c49bf 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); |
