diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2012-12-15 23:51:15 +0100 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-25 09:24:25 +0900 |
| commit | c0fdbff91b4d7e0a594adbc92964f07d71adf6b2 (patch) | |
| tree | 135280d6ac04dcfd2788d67b70958c9851ddc20a /arch/sh | |
| parent | 77bd27b240a517f3fa218d672cac1906b7e3a448 (diff) | |
| download | linux-c0fdbff91b4d7e0a594adbc92964f07d71adf6b2.tar.gz | |
sh: sh7786: 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/Kconfig | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 7d5bc1df1a95..27f0b7306932 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -507,6 +507,7 @@ config CPU_SUBTYPE_SH7786 select USB_OHCI_SH if USB_OHCI_HCD select USB_ARCH_HAS_EHCI select USB_EHCI_SH if USB_EHCI_HCD + select PINCTRL config CPU_SUBTYPE_SHX3 bool "Support SH-X3 processor" diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c index 60df99c7bc26..be876b0f1ad0 100644 --- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c +++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c @@ -16,6 +16,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/gpio.h> +#include <cpu/pfc.h> #include <cpu/sh7786.h> enum { @@ -837,7 +838,7 @@ static struct pinmux_info sh7786_pinmux_info = { static int __init plat_pinmux_setup(void) { - return register_pinmux(&sh7786_pinmux_info); + return sh_pfc_register_info(NULL, NULL, 0, &sh7786_pinmux_info); } arch_initcall(plat_pinmux_setup); |