AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

sh: sh7734: Register PFC platform device

Browse Source 
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>
This commit is contained in:
Laurent Pinchart 2012-12-15 23:51:12 +01:00 committed by Simon Horman
parent 18ebd22884
commit 2c17218257
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/sh/Kconfig
View File

@ -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.

8
arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c
View File

@ -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);