Skip to content

Commit

Permalink
sh: sh7734: Register PFC platform device
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Laurent Pinchart authored and Simon Horman committed Jan 25, 2013
1 parent 18ebd22 commit 2c17218
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions arch/sh/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
8 changes: 4 additions & 4 deletions arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down Expand Up @@ -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,
Expand All @@ -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);

0 comments on commit 2c17218

Please sign in to comment.