Patchwork [U-Boot] i.mx6q: mx6qsabrelite: Setup uart1 pinmux

login
register
mail settings
Submitter Dirk Behme
Date Jan. 13, 2012, 9:49 a.m.
Message ID <1326448165-24041-3-git-send-email-dirk.behme@de.bosch.com>
Download mbox | patch
Permalink /patch/135760/
State Accepted
Commit 8e7d7b6b250cc123555d0250abef0e22b5770467
Delegated to: Stefano Babic
Headers show

Comments

Dirk Behme - Jan. 13, 2012, 9:49 a.m.
From: Troy Kisky <troy.kisky@boundarydevices.com>

This allows the Linux kernel to use UART1 before pinmux
support is added for UART1

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
CC: Troy Kisky <troy.kisky@boundarydevices.com>
CC: Jason Liu <jason.hui@linaro.org>
CC: Stefano Babic <sbabic@denx.de>
---
Note: This patch is against the recent head of u-boot-imx.git including
      the SabreLite support:

      5b894e4d00ff94a221f8cc23d54d08b889f54190
      i.mx: i.mx6q: add the initial support for i.mx6q Sabre Lite board

Note: tools/checkpatch.pl reports 0 errors, 0 warnings

 board/freescale/mx6qsabrelite/mx6qsabrelite.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
Jason Liu - Jan. 16, 2012, 1:45 p.m.
On Fri, Jan 13, 2012 at 5:49 PM, Dirk Behme <dirk.behme@de.bosch.com> wrote:
> From: Troy Kisky <troy.kisky@boundarydevices.com>
>
> This allows the Linux kernel to use UART1 before pinmux
> support is added for UART1
>
> Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
> CC: Troy Kisky <troy.kisky@boundarydevices.com>
> CC: Jason Liu <jason.hui@linaro.org>
> CC: Stefano Babic <sbabic@denx.de>
> ---
> Note: This patch is against the recent head of u-boot-imx.git including
>      the SabreLite support:
>
>      5b894e4d00ff94a221f8cc23d54d08b889f54190
>      i.mx: i.mx6q: add the initial support for i.mx6q Sabre Lite board
>
> Note: tools/checkpatch.pl reports 0 errors, 0 warnings
>

Acked-by: Jason Liu <jason.hui@linaro.org>


>  board/freescale/mx6qsabrelite/mx6qsabrelite.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/board/freescale/mx6qsabrelite/mx6qsabrelite.c b/board/freescale/mx6qsabrelite/mx6qsabrelite.c
> index 4028789..233e652 100644
> --- a/board/freescale/mx6qsabrelite/mx6qsabrelite.c
> +++ b/board/freescale/mx6qsabrelite/mx6qsabrelite.c
> @@ -47,6 +47,11 @@ int dram_init(void)
>        return 0;
>  }
>
> +iomux_v3_cfg_t uart1_pads[] = {
> +       MX6Q_PAD_SD3_DAT6__UART1_RXD | MUX_PAD_CTRL(UART_PAD_CTRL),
> +       MX6Q_PAD_SD3_DAT7__UART1_TXD | MUX_PAD_CTRL(UART_PAD_CTRL),
> +};
> +
>  iomux_v3_cfg_t uart2_pads[] = {
>        MX6Q_PAD_EIM_D26__UART2_TXD | MUX_PAD_CTRL(UART_PAD_CTRL),
>        MX6Q_PAD_EIM_D27__UART2_RXD | MUX_PAD_CTRL(UART_PAD_CTRL),
> @@ -74,6 +79,7 @@ iomux_v3_cfg_t usdhc4_pads[] = {
>
>  static void setup_iomux_uart(void)
>  {
> +       imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
>        imx_iomux_v3_setup_multiple_pads(uart2_pads, ARRAY_SIZE(uart2_pads));
>  }
>
> --
> 1.7.0.4
>
Stefano Babic - Jan. 17, 2012, 9:45 a.m.
On 13/01/2012 10:49, Dirk Behme wrote:
> From: Troy Kisky <troy.kisky@boundarydevices.com>
> 
> This allows the Linux kernel to use UART1 before pinmux
> support is added for UART1
> 
> Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
> CC: Troy Kisky <troy.kisky@boundarydevices.com>
> CC: Jason Liu <jason.hui@linaro.org>
> CC: Stefano Babic <sbabic@denx.de>
> ---

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Patch

diff --git a/board/freescale/mx6qsabrelite/mx6qsabrelite.c b/board/freescale/mx6qsabrelite/mx6qsabrelite.c
index 4028789..233e652 100644
--- a/board/freescale/mx6qsabrelite/mx6qsabrelite.c
+++ b/board/freescale/mx6qsabrelite/mx6qsabrelite.c
@@ -47,6 +47,11 @@  int dram_init(void)
        return 0;
 }
 
+iomux_v3_cfg_t uart1_pads[] = {
+	MX6Q_PAD_SD3_DAT6__UART1_RXD | MUX_PAD_CTRL(UART_PAD_CTRL),
+	MX6Q_PAD_SD3_DAT7__UART1_TXD | MUX_PAD_CTRL(UART_PAD_CTRL),
+};
+
 iomux_v3_cfg_t uart2_pads[] = {
        MX6Q_PAD_EIM_D26__UART2_TXD | MUX_PAD_CTRL(UART_PAD_CTRL),
        MX6Q_PAD_EIM_D27__UART2_RXD | MUX_PAD_CTRL(UART_PAD_CTRL),
@@ -74,6 +79,7 @@  iomux_v3_cfg_t usdhc4_pads[] = {
 
 static void setup_iomux_uart(void)
 {
+	imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
        imx_iomux_v3_setup_multiple_pads(uart2_pads, ARRAY_SIZE(uart2_pads));
 }