diff options
| author | Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com> | 2012-07-09 08:52:42 +0000 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-01 14:58:10 +0200 | 
| commit | 680866a502da0abf40aa6e0f216640b5792c1ce6 (patch) | |
| tree | 7777a9367f11ed1d1ff3c7ab7b73c29669f0ad31 | |
| parent | 89473d233f0d8ef74c6aac37fe3258ef3d3efc06 (diff) | |
| download | olio-uboot-2014.01-680866a502da0abf40aa6e0f216640b5792c1ce6.tar.xz olio-uboot-2014.01-680866a502da0abf40aa6e0f216640b5792c1ce6.zip | |
arm/davinci/da850: add uart0 pinmux
Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com>
Tested-by: Sughosh Ganu <urwithsughosh@gmail.com>
| -rw-r--r-- | arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c | 5 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-davinci/hardware.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-davinci/pinmux_defs.h | 1 | 
3 files changed, 7 insertions, 0 deletions
| diff --git a/arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c b/arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c index ad600b2b7..133265e5b 100644 --- a/arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c +++ b/arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c @@ -35,6 +35,11 @@ const struct pinmux_config spi1_pins_scs0[] = {  };  /* UART pin muxer settings */ +const struct pinmux_config uart0_pins_txrx[] = { +	{ pinmux(3), 2, 4 }, /* UART0_RXD */ +	{ pinmux(3), 2, 5 }, /* UART0_TXD */ +}; +  const struct pinmux_config uart1_pins_txrx[] = {  	{ pinmux(4), 2, 6 }, /* UART1_RXD */  	{ pinmux(4), 2, 7 }, /* UART1_TXD */ diff --git a/arch/arm/include/asm/arch-davinci/hardware.h b/arch/arm/include/asm/arch-davinci/hardware.h index acb0fe233..d8a7c7f3f 100644 --- a/arch/arm/include/asm/arch-davinci/hardware.h +++ b/arch/arm/include/asm/arch-davinci/hardware.h @@ -448,6 +448,7 @@ struct davinci_pllc_regs {  enum davinci_clk_ids {  	DAVINCI_MMCSD_CLKID = 2,  	DAVINCI_SPI0_CLKID = 2, +	DAVINCI_UART0_CLKID = 2,  	DAVINCI_UART2_CLKID = 2,  	DAVINCI_MMC_CLKID = 2,  	DAVINCI_MDIO_CLKID = 4, diff --git a/arch/arm/include/asm/arch-davinci/pinmux_defs.h b/arch/arm/include/asm/arch-davinci/pinmux_defs.h index 0db1e401a..a851f1f50 100644 --- a/arch/arm/include/asm/arch-davinci/pinmux_defs.h +++ b/arch/arm/include/asm/arch-davinci/pinmux_defs.h @@ -28,6 +28,7 @@ extern const struct pinmux_config spi1_pins_base[3];  extern const struct pinmux_config spi1_pins_scs0[1];  /* UART pin muxer settings */ +extern const struct pinmux_config uart0_pins_txrx[2];  extern const struct pinmux_config uart1_pins_txrx[2];  extern const struct pinmux_config uart2_pins_txrx[2];  extern const struct pinmux_config uart2_pins_rtscts[2]; |