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

   1 From f4c0850f31389bbb6b8d806be7786efc62af1e84 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 110/164] 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 --- a/arch/mips/ralink/common.h
  16 +++ b/arch/mips/ralink/common.h
  17 @@ -22,6 +22,7 @@ struct ralink_pinmux {
  18         struct ralink_pinmux_grp *mode;
  19         struct ralink_pinmux_grp *uart;
  20         int uart_shift;
  21 +       u32 uart_mask;
  22         void (*wdt_reset)(void);
  23         struct ralink_pinmux_grp *pci;
  24         int pci_shift;
  25 --- a/arch/mips/ralink/rt305x.c
  26 +++ b/arch/mips/ralink/rt305x.c
  27 @@ -91,12 +91,12 @@ static struct ralink_pinmux_grp uart_mux
  28                 .name = "gpio uartf",
  29                 .mask = RT305X_GPIO_MODE_GPIO_UARTF,
  30                 .gpio_first = RT305X_GPIO_7,
  31 -               .gpio_last = RT305X_GPIO_14,
  32 +               .gpio_last = RT305X_GPIO_10,
  33         }, {
  34                 .name = "gpio i2s",
  35                 .mask = RT305X_GPIO_MODE_GPIO_I2S,
  36                 .gpio_first = RT305X_GPIO_7,
  37 -               .gpio_last = RT305X_GPIO_14,
  38 +               .gpio_last = RT305X_GPIO_10,
  39         }, {
  40                 .name = "gpio",
  41                 .mask = RT305X_GPIO_MODE_GPIO,
  42 @@ -118,6 +118,7 @@ struct ralink_pinmux rt_gpio_pinmux = {
  43         .mode = mode_mux,
  44         .uart = uart_mux,
  45         .uart_shift = RT305X_GPIO_MODE_UART0_SHIFT,
  46 +       .uart_mask = RT305X_GPIO_MODE_UART0_MASK,
  47         .wdt_reset = rt305x_wdt_reset,
  48  };
  49