aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/mux.c
diff options
context:
space:
mode:
authorCory Maccarrone <darkstar6262@gmail.com>2010-08-02 14:21:39 +0300
committerTony Lindgren <tony@atomide.com>2010-08-02 14:21:39 +0300
commit8b8fbd39e20b5db95f8f4b3bda4c9d3fcf8e3afc (patch)
tree2e164da265d61b97cf2edfa55579032e24dd77df /arch/arm/mach-omap1/mux.c
parentomap: Add back UART MDR1 check into uncompress.h (diff)
downloadlinux-dev-8b8fbd39e20b5db95f8f4b3bda4c9d3fcf8e3afc.tar.xz
linux-dev-8b8fbd39e20b5db95f8f4b3bda4c9d3fcf8e3afc.zip
omap1: omap7xx clocks, mux, serial fixes
This change adds in the necessary clocks and mux pins for UART control on omap7xx devices. I also made a change in the serial code to only try and initialize two UARTs in omap_serial_init, as these devices don't have three. Signed-off-by: Cory Maccarrone <darkstar6262@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/mux.c')
-rw-r--r--arch/arm/mach-omap1/mux.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
index 84341377232d..6a9b42f4113f 100644
--- a/arch/arm/mach-omap1/mux.c
+++ b/arch/arm/mach-omap1/mux.c
@@ -70,6 +70,10 @@ MUX_CFG_7XX("SPI_7XX_3", 6, 13, 4, 12, 1, 0)
MUX_CFG_7XX("SPI_7XX_4", 6, 17, 4, 16, 1, 0)
MUX_CFG_7XX("SPI_7XX_5", 8, 25, 0, 24, 0, 0)
MUX_CFG_7XX("SPI_7XX_6", 9, 5, 0, 4, 0, 0)
+
+/* UART pins */
+MUX_CFG_7XX("UART_7XX_1", 3, 21, 0, 20, 0, 0)
+MUX_CFG_7XX("UART_7XX_2", 8, 1, 6, 0, 0, 0)
};
#define OMAP7XX_PINS_SZ ARRAY_SIZE(omap7xx_pins)
#else