diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-04-12 01:38:03 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-06-05 04:18:23 -0400 |
commit | 111ea17927b4be0be2423c4b7a94d6b0ab1d92a6 (patch) | |
tree | a8398449cd113cab05e5beef88cbd4a216d23e53 /arch/arm | |
parent | 41534a37c427c9b715ee75cd7ef34785bb81785f (diff) |
ARM: shmobile: bockw: add pinctrl support
SCIF0 support as 1st step
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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-shmobile/board-bockw.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c index 38e5e50fb318..dac4365c5158 100644 --- a/arch/arm/mach-shmobile/board-bockw.c +++ b/arch/arm/mach-shmobile/board-bockw.c | |||
@@ -18,6 +18,7 @@ | |||
18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/pinctrl/machine.h> | ||
21 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
22 | #include <linux/smsc911x.h> | 23 | #include <linux/smsc911x.h> |
23 | #include <mach/common.h> | 24 | #include <mach/common.h> |
@@ -37,6 +38,14 @@ static struct resource smsc911x_resources[] = { | |||
37 | DEFINE_RES_IRQ(irq_pin(0)), /* IRQ 0 */ | 38 | DEFINE_RES_IRQ(irq_pin(0)), /* IRQ 0 */ |
38 | }; | 39 | }; |
39 | 40 | ||
41 | static const struct pinctrl_map bockw_pinctrl_map[] = { | ||
42 | /* SCIF0 */ | ||
43 | PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778", | ||
44 | "scif0_data_a", "scif0"), | ||
45 | PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778", | ||
46 | "scif0_ctrl", "scif0"), | ||
47 | }; | ||
48 | |||
40 | #define IRQ0MR 0x30 | 49 | #define IRQ0MR 0x30 |
41 | static void __init bockw_init(void) | 50 | static void __init bockw_init(void) |
42 | { | 51 | { |
@@ -46,6 +55,10 @@ static void __init bockw_init(void) | |||
46 | r8a7778_init_irq_extpin(1); | 55 | r8a7778_init_irq_extpin(1); |
47 | r8a7778_add_standard_devices(); | 56 | r8a7778_add_standard_devices(); |
48 | 57 | ||
58 | pinctrl_register_mappings(bockw_pinctrl_map, | ||
59 | ARRAY_SIZE(bockw_pinctrl_map)); | ||
60 | r8a7778_pinmux_init(); | ||
61 | |||
49 | fpga = ioremap_nocache(0x18200000, SZ_1M); | 62 | fpga = ioremap_nocache(0x18200000, SZ_1M); |
50 | if (fpga) { | 63 | if (fpga) { |
51 | /* | 64 | /* |