diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2012-12-15 17:51:12 -0500 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-24 19:24:24 -0500 |
| commit | 2c17218257dc948a4c0b89de900eab0261ac0f77 (patch) | |
| tree | 500d58c0b0847081cc3fd1ae0dc813526ff2c95e | |
| parent | 18ebd2288419952fe908aa78ccf531f12d0ddfd8 (diff) | |
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>
| -rw-r--r-- | arch/sh/Kconfig | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c | 8 |
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 | |||
| 456 | select ARCH_WANT_OPTIONAL_GPIOLIB | 456 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 457 | select USB_ARCH_HAS_OHCI | 457 | select USB_ARCH_HAS_OHCI |
| 458 | select USB_ARCH_HAS_EHCI | 458 | select USB_ARCH_HAS_EHCI |
| 459 | select PINCTRL | ||
| 459 | help | 460 | help |
| 460 | Select SH7734 if you have a SH4A SH7734 CPU. | 461 | Select SH7734 if you have a SH4A SH7734 CPU. |
| 461 | 462 | ||
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 @@ | |||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/gpio.h> | 13 | #include <linux/gpio.h> |
| 14 | #include <linux/ioport.h> | 14 | #include <linux/ioport.h> |
| 15 | #include <cpu/pfc.h> | ||
| 15 | #include <cpu/sh7734.h> | 16 | #include <cpu/sh7734.h> |
| 16 | 17 | ||
| 17 | #define CPU_32_PORT(fn, pfx, sfx) \ | 18 | #define CPU_32_PORT(fn, pfx, sfx) \ |
| @@ -2467,9 +2468,6 @@ static struct resource sh7734_pfc_resources[] = { | |||
| 2467 | static struct pinmux_info sh7734_pinmux_info = { | 2468 | static struct pinmux_info sh7734_pinmux_info = { |
| 2468 | .name = "sh7734_pfc", | 2469 | .name = "sh7734_pfc", |
| 2469 | 2470 | ||
| 2470 | .resource = sh7734_pfc_resources, | ||
| 2471 | .num_resources = ARRAY_SIZE(sh7734_pfc_resources), | ||
| 2472 | |||
| 2473 | .unlock_reg = 0xFFFC0000, | 2471 | .unlock_reg = 0xFFFC0000, |
| 2474 | 2472 | ||
| 2475 | .reserved_id = PINMUX_RESERVED, | 2473 | .reserved_id = PINMUX_RESERVED, |
| @@ -2492,6 +2490,8 @@ static struct pinmux_info sh7734_pinmux_info = { | |||
| 2492 | 2490 | ||
| 2493 | static int __init plat_pinmux_setup(void) | 2491 | static int __init plat_pinmux_setup(void) |
| 2494 | { | 2492 | { |
| 2495 | return register_pinmux(&sh7734_pinmux_info); | 2493 | return sh_pfc_register_info(NULL, sh7734_pfc_resources, |
| 2494 | ARRAY_SIZE(sh7734_pfc_resources), | ||
| 2495 | &sh7734_pinmux_info); | ||
| 2496 | } | 2496 | } |
| 2497 | arch_initcall(plat_pinmux_setup); | 2497 | arch_initcall(plat_pinmux_setup); |