summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLuciano Coelho <coelho@ti.com>2013-01-21 13:14:12 +0200
committerTony Lindgren <tony@atomide.com>2013-01-21 10:39:53 -0800
commit7662a9c60fee25d7234da4be6d8eab2b2ac88448 (patch)
tree8c3d9f82391f894e914d9b6a0cda191d3de1d6ac /arch/arm
parent034bf091b7a5f02e63409b0b5b6dad1101d70144 (diff)
downloadlinux-3.10-7662a9c60fee25d7234da4be6d8eab2b2ac88448.tar.gz
linux-3.10-7662a9c60fee25d7234da4be6d8eab2b2ac88448.tar.bz2
linux-3.10-7662a9c60fee25d7234da4be6d8eab2b2ac88448.zip
ARM: OMAP2+: omap4-panda: add UART2 muxing for WiLink shared transport
Add the UART2 muxing data to the board file (this used to be, erroneously, done in the bootloader). Cc: stable <stable@vger.kernel.org> [3.7] Signed-off-by: Luciano Coelho <coelho@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/board-omap4panda.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 5c8e9cee2c2..769c1feee1c 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -397,6 +397,12 @@ static struct omap_board_mux board_mux[] __initdata = {
OMAP_PULL_ENA),
OMAP4_MUX(ABE_MCBSP1_FSX, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
+ /* UART2 - BT/FM/GPS shared transport */
+ OMAP4_MUX(UART2_CTS, OMAP_PIN_INPUT | OMAP_MUX_MODE0),
+ OMAP4_MUX(UART2_RTS, OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),
+ OMAP4_MUX(UART2_RX, OMAP_PIN_INPUT | OMAP_MUX_MODE0),
+ OMAP4_MUX(UART2_TX, OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),
+
{ .reg_offset = OMAP_MUX_TERMINATOR },
};