Patchwork [U-Boot,v3,2/3] arm, davinci, da850: add uart1 tx rx pinmux config

login
register
mail settings
Submitter Heiko Schocher
Date Nov. 28, 2011, 10:44 a.m.
Message ID <1322477089-32368-3-git-send-email-hs@denx.de>
Download mbox | patch
Permalink /patch/127956/
State Superseded
Headers show

Comments

Heiko Schocher - Nov. 28, 2011, 10:44 a.m.
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Tom Rini <tom.rini@gmail.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Christian Riesch <christian.riesch@omicron.at>
---
 arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c   |    5 +++++
 arch/arm/include/asm/arch-davinci/pinmux_defs.h |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)
Tom Rini - Nov. 28, 2011, 2:57 p.m.
On Mon, Nov 28, 2011 at 3:44 AM, Heiko Schocher <hs@denx.de> wrote:
> Signed-off-by: Heiko Schocher <hs@denx.de>
> Cc: Sandeep Paulraj <s-paulraj@ti.com>
> Cc: Tom Rini <tom.rini@gmail.com>
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> Cc: Christian Riesch <christian.riesch@omicron.at>

Acked-by: Tom Rini <trini@ti.com>

> ---
>  arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c   |    5 +++++
>  arch/arm/include/asm/arch-davinci/pinmux_defs.h |    1 +
>  2 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c b/arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c
> index a3472ea..fa07fb5 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 uart1_pins_txrx[] = {
> +       { pinmux(4), 2, 6 }, /* UART1_RXD */
> +       { pinmux(4), 2, 7 }, /* UART1_TXD */
> +};
> +
>  const struct pinmux_config uart2_pins_txrx[] = {
>        { pinmux(4), 2, 4 }, /* UART2_RXD */
>        { pinmux(4), 2, 5 }, /* UART2_TXD */
> diff --git a/arch/arm/include/asm/arch-davinci/pinmux_defs.h b/arch/arm/include/asm/arch-davinci/pinmux_defs.h
> index 191494b..07aceaa 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 uart1_pins_txrx[2];
>  extern const struct pinmux_config uart2_pins_txrx[2];
>  extern const struct pinmux_config uart2_pins_rtscts[2];
>
> --
> 1.7.6.4
>
>

Patch

diff --git a/arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c b/arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c
index a3472ea..fa07fb5 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 uart1_pins_txrx[] = {
+	{ pinmux(4), 2, 6 }, /* UART1_RXD */
+	{ pinmux(4), 2, 7 }, /* UART1_TXD */
+};
+
 const struct pinmux_config uart2_pins_txrx[] = {
 	{ pinmux(4), 2, 4 }, /* UART2_RXD */
 	{ pinmux(4), 2, 5 }, /* UART2_TXD */
diff --git a/arch/arm/include/asm/arch-davinci/pinmux_defs.h b/arch/arm/include/asm/arch-davinci/pinmux_defs.h
index 191494b..07aceaa 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 uart1_pins_txrx[2];
 extern const struct pinmux_config uart2_pins_txrx[2];
 extern const struct pinmux_config uart2_pins_rtscts[2];