summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2012-12-15 23:51:12 +0100
committerSimon Horman <horms+renesas@verge.net.au>2013-01-25 09:24:24 +0900
commit2c17218257dc948a4c0b89de900eab0261ac0f77 (patch)
tree500d58c0b0847081cc3fd1ae0dc813526ff2c95e /arch/sh
parent18ebd2288419952fe908aa78ccf531f12d0ddfd8 (diff)
downloadlinux-2c17218257dc948a4c0b89de900eab0261ac0f77.tar.gz
linux-2c17218257dc948a4c0b89de900eab0261ac0f77.tar.bz2
linux-2c17218257dc948a4c0b89de900eab0261ac0f77.zip
sh: sh7734: 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/Kconfig1
-rw-r--r--arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 18852130af1a..7a7d2ec7dc53 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -456,6 +456,7 @@ config CPU_SUBTYPE_SH7734
select ARCH_WANT_OPTIONAL_GPIOLIB
select USB_ARCH_HAS_OHCI
select USB_ARCH_HAS_EHCI
+ select PINCTRL
help
Select SH7734 if you have a SH4A SH7734 CPU.
diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c
index eed3b9d19d38..fa3358319443 100644
--- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c
+++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c
@@ -12,6 +12,7 @@
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <linux/ioport.h>
+#include <cpu/pfc.h>
#include <cpu/sh7734.h>
#define CPU_32_PORT(fn, pfx, sfx) \
@@ -2467,9 +2468,6 @@ static struct resource sh7734_pfc_resources[] = {
static struct pinmux_info sh7734_pinmux_info = {
.name = "sh7734_pfc",
- .resource = sh7734_pfc_resources,
- .num_resources = ARRAY_SIZE(sh7734_pfc_resources),
-
.unlock_reg = 0xFFFC0000,
.reserved_id = PINMUX_RESERVED,
@@ -2492,6 +2490,8 @@ static struct pinmux_info sh7734_pinmux_info = {
static int __init plat_pinmux_setup(void)
{
- return register_pinmux(&sh7734_pinmux_info);
+ return sh_pfc_register_info(NULL, sh7734_pfc_resources,
+ ARRAY_SIZE(sh7734_pfc_resources),
+ &sh7734_pinmux_info);
}
arch_initcall(plat_pinmux_setup);