| From 5e2f0119bcd946fe100e8216f4a961e8ede87269 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Fri, 12 Apr 2013 05:37:50 +0000 |
| Subject: ARM: shmobile: r8a7778: Register PFC device |
| |
| Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 369b00bbe51e128a201af58a4daabb01253f126e) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/Kconfig | 1 + |
| arch/arm/mach-shmobile/include/mach/r8a7778.h | 1 + |
| arch/arm/mach-shmobile/setup-r8a7778.c | 13 +++++++++++++ |
| 3 files changed, 15 insertions(+) |
| |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index c6fb9ec8..638e5c57 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -37,6 +37,7 @@ config ARCH_R8A7740 |
| |
| config ARCH_R8A7778 |
| bool "R-Car M1 (R8A77780)" |
| + select ARCH_WANT_OPTIONAL_GPIOLIB |
| select CPU_V7 |
| select SH_CLK_CPG |
| select ARM_GIC |
| diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/include/mach/r8a7778.h |
| index 951149e6..68053fc4 100644 |
| --- a/arch/arm/mach-shmobile/include/mach/r8a7778.h |
| +++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h |
| @@ -28,5 +28,6 @@ extern void r8a7778_init_irq(void); |
| extern void r8a7778_init_irq_dt(void); |
| extern void r8a7778_clock_init(void); |
| extern void r8a7778_init_irq_extpin(int irlm); |
| +extern void r8a7778_pinmux_init(void); |
| |
| #endif /* __ASM_R8A7778_H__ */ |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c |
| index 30b4a336..0ca57010 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7778.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7778.c |
| @@ -94,6 +94,19 @@ static struct resource ether_resources[] = { |
| &sh_tmu##idx##_platform_data, \ |
| sizeof(sh_tmu##idx##_platform_data)) |
| |
| +/* PFC */ |
| +static struct resource pfc_resources[] = { |
| + DEFINE_RES_MEM(0xfffc0000, 0x118), |
| +}; |
| + |
| +void __init r8a7778_pinmux_init(void) |
| +{ |
| + platform_device_register_simple( |
| + "pfc-r8a7778", -1, |
| + pfc_resources, |
| + ARRAY_SIZE(pfc_resources)); |
| +} |
| + |
| void __init r8a7778_add_standard_devices(void) |
| { |
| int i; |
| -- |
| 1.8.4.3.gca3854a |
| |