diff options
author | Ido Yariv <ido@wizery.com> | 2011-07-10 09:14:38 -0400 |
---|---|---|
committer | Sekhar Nori <nsekhar@ti.com> | 2011-09-17 06:23:22 -0400 |
commit | 6836989c35b285b566b932fdbb8402edf8fcc887 (patch) | |
tree | 55eedfc7b0bf3ce869b31c48477af28c1c61fc0a | |
parent | 5c4d11b477f66080c9305c91e5d387c796be411c (diff) |
ARM: davinci: DA850: Add GPIO pinmux configuration for wl1271
The wl1271 daughter board makes use of a few GPIOs:
GPIO6_9 is used for powering down/up the WLAN functionality.
GPIO6_10 is used as an input IRQ line from the WLAN chip.
Add the required pinmux configuration for these GPIOs.
Signed-off-by: Ido Yariv <ido@wizery.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
-rw-r--r-- | arch/arm/mach-davinci/da850.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/mux.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 87cdce64fba7..0cf0d8845422 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c | |||
@@ -600,6 +600,8 @@ static const struct mux_config da850_pins[] = { | |||
600 | MUX_CFG(DA850, GPIO3_13, 7, 8, 15, 8, false) | 600 | MUX_CFG(DA850, GPIO3_13, 7, 8, 15, 8, false) |
601 | MUX_CFG(DA850, GPIO4_0, 10, 28, 15, 8, false) | 601 | MUX_CFG(DA850, GPIO4_0, 10, 28, 15, 8, false) |
602 | MUX_CFG(DA850, GPIO4_1, 10, 24, 15, 8, false) | 602 | MUX_CFG(DA850, GPIO4_1, 10, 24, 15, 8, false) |
603 | MUX_CFG(DA850, GPIO6_9, 13, 24, 15, 8, false) | ||
604 | MUX_CFG(DA850, GPIO6_10, 13, 20, 15, 8, false) | ||
603 | MUX_CFG(DA850, GPIO6_13, 13, 8, 15, 8, false) | 605 | MUX_CFG(DA850, GPIO6_13, 13, 8, 15, 8, false) |
604 | MUX_CFG(DA850, RTC_ALARM, 0, 28, 15, 2, false) | 606 | MUX_CFG(DA850, RTC_ALARM, 0, 28, 15, 2, false) |
605 | #endif | 607 | #endif |
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h index 7fb7f1eb0d6b..a7e92fca32e6 100644 --- a/arch/arm/mach-davinci/include/mach/mux.h +++ b/arch/arm/mach-davinci/include/mach/mux.h | |||
@@ -924,6 +924,8 @@ enum davinci_da850_index { | |||
924 | DA850_GPIO3_13, | 924 | DA850_GPIO3_13, |
925 | DA850_GPIO4_0, | 925 | DA850_GPIO4_0, |
926 | DA850_GPIO4_1, | 926 | DA850_GPIO4_1, |
927 | DA850_GPIO6_9, | ||
928 | DA850_GPIO6_10, | ||
927 | DA850_GPIO6_13, | 929 | DA850_GPIO6_13, |
928 | DA850_RTC_ALARM, | 930 | DA850_RTC_ALARM, |
929 | }; | 931 | }; |