1 Index: linux-3.10.32/arch/mips/ralink/rt288x.c
2 ===================================================================
3 --- linux-3.10.32.orig/arch/mips/ralink/rt288x.c 2014-02-22 20:41:54.000000000 +0000
4 +++ linux-3.10.32/arch/mips/ralink/rt288x.c 2014-03-18 11:18:06.689596876 +0000
6 #include <asm/mipsregs.h>
7 #include <asm/mach-ralink/ralink_regs.h>
8 #include <asm/mach-ralink/rt288x.h>
9 +#include <asm/mach-ralink/pinmux.h>
13 -static struct ralink_pinmux_grp mode_mux[] = {
16 - .mask = RT2880_GPIO_MODE_I2C,
21 - .mask = RT2880_GPIO_MODE_SPI,
26 - .mask = RT2880_GPIO_MODE_UART0,
31 - .mask = RT2880_GPIO_MODE_JTAG,
36 - .mask = RT2880_GPIO_MODE_MDIO,
41 - .mask = RT2880_GPIO_MODE_SDRAM,
46 - .mask = RT2880_GPIO_MODE_PCI,
50 +static struct rt2880_pmx_func i2c_func[] = { FUNC("i2c", 0, 1, 2) };
51 +static struct rt2880_pmx_func spi_func[] = { FUNC("spi", 0, 3, 6) };
52 +static struct rt2880_pmx_func uartlite_func[] = { FUNC("uartlite", 0, 7, 14) };
53 +static struct rt2880_pmx_func jtag_func[] = { FUNC("jtag", 0, 17, 21) };
54 +static struct rt2880_pmx_func mdio_func[] = { FUNC("mdio", 0, 22, 23) };
55 +static struct rt2880_pmx_func sdram_func[] = { FUNC("sdram", 0, 24, 39) };
56 +static struct rt2880_pmx_func pci_func[] = { FUNC("pci", 0, 40, 71) };
58 +static struct rt2880_pmx_group rt2880_pinmux_data_act[] = {
59 + GRP("i2c", i2c_func, 1, RT2880_GPIO_MODE_I2C),
60 + GRP("spi", spi_func, 1, RT2880_GPIO_MODE_SPI),
61 + GRP("uartlite", uartlite_func, 1, RT2880_GPIO_MODE_UART0),
62 + GRP("jtag", jtag_func, 1, RT2880_GPIO_MODE_JTAG),
63 + GRP("mdio", mdio_func, 1, RT2880_GPIO_MODE_MDIO),
64 + GRP("sdram", sdram_func, 1, RT2880_GPIO_MODE_SDRAM),
65 + GRP("pci", pci_func, 1, RT2880_GPIO_MODE_PCI),
69 static void rt288x_wdt_reset(void)
71 rt_sysc_w32(t, SYSC_REG_CLKCFG);
74 -struct ralink_pinmux rt_gpio_pinmux = {
76 - .wdt_reset = rt288x_wdt_reset,
79 void __init ralink_clk_init(void)
81 unsigned long cpu_rate;
83 soc_info->mem_base = RT2880_SDRAM_BASE;
84 soc_info->mem_size_min = RT2880_MEM_SIZE_MIN;
85 soc_info->mem_size_max = RT2880_MEM_SIZE_MAX;
87 + rt2880_pinmux_data = rt2880_pinmux_data_act;