target/linux/ramips/patches-3.8/0026-MIPS-ralink-add-uart-mask-to-struct-ralink_pinmux.patch

   1 From 6e09e0465b342b52ecda583cbc41e6a31c363b3f Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Fri, 12 Apr 2013 12:45:27 +0200
   4 Subject: [PATCH 26/79] MIPS: ralink: add uart mask to struct ralink_pinmux
   5
   6 Add a field for the uart muxing mask and set it inside the rt305x setup code.
   7
   8 Signed-off-by: John Crispin <blogic@openwrt.org>
   9 Patchwork: http://patchwork.linux-mips.org/patch/5744/
  10 ---
  11  arch/mips/ralink/common.h |    1 +
  12  arch/mips/ralink/rt305x.c |    5 +++--
  13  2 files changed, 4 insertions(+), 2 deletions(-)
  14
  15 diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
  16 index bebd149..299119b 100644
  17 --- a/arch/mips/ralink/common.h
  18 +++ b/arch/mips/ralink/common.h
  19 @@ -22,6 +22,7 @@ struct ralink_pinmux {
  20         struct ralink_pinmux_grp *mode;
  21         struct ralink_pinmux_grp *uart;
  22         int uart_shift;
  23 +       u32 uart_mask;
  24         void (*wdt_reset)(void);
  25         struct ralink_pinmux_grp *pci;
  26         int pci_shift;
  27 diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
  28 index 5b42078..6aa3cb1 100644
  29 --- a/arch/mips/ralink/rt305x.c
  30 +++ b/arch/mips/ralink/rt305x.c
  31 @@ -91,12 +91,12 @@ static struct ralink_pinmux_grp uart_mux[] = {
  32                 .name = "gpio uartf",
  33                 .mask = RT305X_GPIO_MODE_GPIO_UARTF,
  34                 .gpio_first = RT305X_GPIO_7,
  35 -               .gpio_last = RT305X_GPIO_14,
  36 +               .gpio_last = RT305X_GPIO_10,
  37         }, {
  38                 .name = "gpio i2s",
  39                 .mask = RT305X_GPIO_MODE_GPIO_I2S,
  40                 .gpio_first = RT305X_GPIO_7,
  41 -               .gpio_last = RT305X_GPIO_14,
  42 +               .gpio_last = RT305X_GPIO_10,
  43         }, {
  44                 .name = "gpio",
  45                 .mask = RT305X_GPIO_MODE_GPIO,
  46 @@ -118,6 +118,7 @@ struct ralink_pinmux rt_gpio_pinmux = {
  47         .mode = mode_mux,
  48         .uart = uart_mux,
  49         .uart_shift = RT305X_GPIO_MODE_UART0_SHIFT,
  50 +       .uart_mask = RT305X_GPIO_MODE_UART0_MASK,
  51         .wdt_reset = rt305x_wdt_reset,
  52  };
  53
  54 --
  55 1.7.10.4
  56