diff options
-rw-r--r-- | arch/sh/boards/mach-highlander/Kconfig | 1 | ||||
-rw-r--r-- | arch/sh/boards/mach-highlander/Makefile | 10 | ||||
-rw-r--r-- | arch/sh/boards/mach-highlander/pinmux-r7785rp.c | 20 | ||||
-rw-r--r-- | arch/sh/boards/mach-highlander/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/include/mach-common/mach/highlander.h | 6 |
5 files changed, 34 insertions, 5 deletions
diff --git a/arch/sh/boards/mach-highlander/Kconfig b/arch/sh/boards/mach-highlander/Kconfig index fc8f28e04ba3..08057f62687b 100644 --- a/arch/sh/boards/mach-highlander/Kconfig +++ b/arch/sh/boards/mach-highlander/Kconfig | |||
@@ -18,6 +18,7 @@ config SH_R7780MP | |||
18 | config SH_R7785RP | 18 | config SH_R7785RP |
19 | bool "R7785RP board support" | 19 | bool "R7785RP board support" |
20 | depends on CPU_SUBTYPE_SH7785 | 20 | depends on CPU_SUBTYPE_SH7785 |
21 | select GENERIC_GPIO | ||
21 | 22 | ||
22 | endchoice | 23 | endchoice |
23 | 24 | ||
diff --git a/arch/sh/boards/mach-highlander/Makefile b/arch/sh/boards/mach-highlander/Makefile index 20a10080b11f..d93aaf880134 100644 --- a/arch/sh/boards/mach-highlander/Makefile +++ b/arch/sh/boards/mach-highlander/Makefile | |||
@@ -1,10 +1,10 @@ | |||
1 | # | 1 | # |
2 | # Makefile for the R7780RP-1 specific parts of the kernel | 2 | # Makefile for the Highlander specific parts of the kernel |
3 | # | 3 | # |
4 | irqinit-$(CONFIG_SH_R7780MP) := irq-r7780mp.o | 4 | obj-y := setup.o |
5 | irqinit-$(CONFIG_SH_R7785RP) := irq-r7785rp.o | 5 | obj-$(CONFIG_SH_R7780RP) += irq-r7780rp.o |
6 | irqinit-$(CONFIG_SH_R7780RP) := irq-r7780rp.o | 6 | obj-$(CONFIG_SH_R7780MP) += irq-r7780mp.o |
7 | obj-y := setup.o $(irqinit-y) | 7 | obj-$(CONFIG_SH_R7785RP) += irq-r7785rp.o pinmux-r7785rp.o |
8 | 8 | ||
9 | ifneq ($(CONFIG_SH_R7785RP),y) | 9 | ifneq ($(CONFIG_SH_R7785RP),y) |
10 | obj-$(CONFIG_PUSH_SWITCH) += psw.o | 10 | obj-$(CONFIG_PUSH_SWITCH) += psw.o |
diff --git a/arch/sh/boards/mach-highlander/pinmux-r7785rp.c b/arch/sh/boards/mach-highlander/pinmux-r7785rp.c new file mode 100644 index 000000000000..c77a2bea8f2a --- /dev/null +++ b/arch/sh/boards/mach-highlander/pinmux-r7785rp.c | |||
@@ -0,0 +1,20 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2008 Paul Mundt | ||
3 | * | ||
4 | * This file is subject to the terms and conditions of the GNU General Public | ||
5 | * License. See the file "COPYING" in the main directory of this archive | ||
6 | * for more details. | ||
7 | */ | ||
8 | #include <linux/init.h> | ||
9 | #include <linux/gpio.h> | ||
10 | #include <cpu/sh7785.h> | ||
11 | |||
12 | void __init highlander_plat_pinmux_setup(void) | ||
13 | { | ||
14 | /* SCIF0 */ | ||
15 | gpio_request(GPIO_FN_SCIF0_CTS, NULL); | ||
16 | gpio_request(GPIO_FN_SCIF0_RTS, NULL); | ||
17 | gpio_request(GPIO_FN_SCIF0_SCK, NULL); | ||
18 | gpio_request(GPIO_FN_SCIF0_RXD, NULL); | ||
19 | gpio_request(GPIO_FN_SCIF0_TXD, NULL); | ||
20 | } | ||
diff --git a/arch/sh/boards/mach-highlander/setup.c b/arch/sh/boards/mach-highlander/setup.c index c5a40f7906d7..806438b42cac 100644 --- a/arch/sh/boards/mach-highlander/setup.c +++ b/arch/sh/boards/mach-highlander/setup.c | |||
@@ -294,6 +294,8 @@ static void __init highlander_setup(char **cmdline_p) | |||
294 | (ver >> 12) & 0xf, (ver >> 8) & 0xf, | 294 | (ver >> 12) & 0xf, (ver >> 8) & 0xf, |
295 | (ver >> 4) & 0xf, ver & 0xf); | 295 | (ver >> 4) & 0xf, ver & 0xf); |
296 | 296 | ||
297 | highlander_plat_pinmux_setup(); | ||
298 | |||
297 | /* | 299 | /* |
298 | * Enable the important clocks right away.. | 300 | * Enable the important clocks right away.. |
299 | */ | 301 | */ |
diff --git a/arch/sh/include/mach-common/mach/highlander.h b/arch/sh/include/mach-common/mach/highlander.h index 306f7359f7d4..bd26a848cb0b 100644 --- a/arch/sh/include/mach-common/mach/highlander.h +++ b/arch/sh/include/mach-common/mach/highlander.h | |||
@@ -195,4 +195,10 @@ | |||
195 | 195 | ||
196 | unsigned char *highlander_plat_irq_setup(void); | 196 | unsigned char *highlander_plat_irq_setup(void); |
197 | 197 | ||
198 | #ifdef CONFIG_SH_R7785RP | ||
199 | void highlander_plat_pinmux_setup(void); | ||
200 | #else | ||
201 | #define highlander_plat_pinmux_setup() do { } while (0) | ||
202 | #endif | ||
203 | |||
198 | #endif /* __ASM_SH_RENESAS_R7780RP */ | 204 | #endif /* __ASM_SH_RENESAS_R7780RP */ |