diff options
author | Magnus Damm <damm@igel.co.jp> | 2008-10-08 07:42:56 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-19 21:34:29 -0400 |
commit | 843284d0e41b2a7f88504d051d91b5e9dc9c78c7 (patch) | |
tree | 5494af8a8c5a317776182d8560d554d093a06fad /arch/sh/boards/board-magicpanelr2.c | |
parent | c9c3c1b74d3fa304884b5f42bfaffcf71ac6a96c (diff) |
sh: Use sh7720 GPIO on magicpanelr2 board
This patch hooks up the magicpanelr2 board with the sh7720 pinmux code.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/board-magicpanelr2.c')
-rw-r--r-- | arch/sh/boards/board-magicpanelr2.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/sh/boards/board-magicpanelr2.c b/arch/sh/boards/board-magicpanelr2.c index f3b8b07ea5d6..eb0e8e992c29 100644 --- a/arch/sh/boards/board-magicpanelr2.c +++ b/arch/sh/boards/board-magicpanelr2.c | |||
@@ -13,12 +13,14 @@ | |||
13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
16 | #include <linux/gpio.h> | ||
16 | #include <linux/mtd/mtd.h> | 17 | #include <linux/mtd/mtd.h> |
17 | #include <linux/mtd/partitions.h> | 18 | #include <linux/mtd/partitions.h> |
18 | #include <linux/mtd/physmap.h> | 19 | #include <linux/mtd/physmap.h> |
19 | #include <linux/mtd/map.h> | 20 | #include <linux/mtd/map.h> |
20 | #include <asm/magicpanelr2.h> | 21 | #include <asm/magicpanelr2.h> |
21 | #include <asm/heartbeat.h> | 22 | #include <asm/heartbeat.h> |
23 | #include <asm/sh7720.h> | ||
22 | 24 | ||
23 | #define LAN9115_READY (ctrl_inl(0xA8000084UL) & 0x00000001UL) | 25 | #define LAN9115_READY (ctrl_inl(0xA8000084UL) & 0x00000001UL) |
24 | 26 | ||
@@ -170,7 +172,14 @@ static void __init setup_port_multiplexing(void) | |||
170 | /* R7 A25; R6 A24; R5 A23; R4 A22; | 172 | /* R7 A25; R6 A24; R5 A23; R4 A22; |
171 | * R3 A21; R2 A20; R1 A19; R0 A0; | 173 | * R3 A21; R2 A20; R1 A19; R0 A0; |
172 | */ | 174 | */ |
173 | ctrl_outw(0x0000, PORT_PRCR); /* 00 00 00 00 00 00 00 00 */ | 175 | gpio_request(GPIO_FN_A25, NULL); |
176 | gpio_request(GPIO_FN_A24, NULL); | ||
177 | gpio_request(GPIO_FN_A23, NULL); | ||
178 | gpio_request(GPIO_FN_A22, NULL); | ||
179 | gpio_request(GPIO_FN_A21, NULL); | ||
180 | gpio_request(GPIO_FN_A20, NULL); | ||
181 | gpio_request(GPIO_FN_A19, NULL); | ||
182 | gpio_request(GPIO_FN_A0, NULL); | ||
174 | 183 | ||
175 | /* S7 (x); S6 (x); S5 (x); S4 GPO(EEPROM_CS2); | 184 | /* S7 (x); S6 (x); S5 (x); S4 GPO(EEPROM_CS2); |
176 | * S3 GPO(EEPROM_CS1); S2 SIOF0_TXD; S1 SIOF0_RXD; S0 SIOF0_SCK; | 185 | * S3 GPO(EEPROM_CS1); S2 SIOF0_TXD; S1 SIOF0_RXD; S0 SIOF0_SCK; |