diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-02 13:23:38 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-02 13:23:38 +0200 |
| commit | 055a1b8c9927bc587f293020a54c6cd8e24dfac0 (patch) | |
| tree | db7c8d00931180c4896c9e00d2cb506939592cda /arch/arm/mach-omap1/mux.c | |
| parent | omap: mux: fix multipath gpio handling (diff) | |
| parent | omap: Devkit8000: Use DIE id to initialize dm9000 MAC address (diff) | |
| download | linux-055a1b8c9927bc587f293020a54c6cd8e24dfac0.tar.xz linux-055a1b8c9927bc587f293020a54c6cd8e24dfac0.zip | |
Merge branch 'devel-misc' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap1/mux.c')
| -rw-r--r-- | arch/arm/mach-omap1/mux.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c index 3e98835d8f18..7835add00344 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 |