1 files changed, 68 insertions, 85 deletions

diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
index bb82a82da9e7..c40776ab67db 100644
--- a/arch/mips/ralink/rt305x.c
+++ b/arch/mips/ralink/rt305x.c
@@ -17,90 +17,78 @@
 #include <asm/mipsregs.h>
 #include <asm/mach-ralink/ralink_regs.h>
 #include <asm/mach-ralink/rt305x.h>
+#include <asm/mach-ralink/pinmux.h>
 
 #include "common.h"
 
 enum rt305x_soc_type rt305x_soc;
 
-static struct ralink_pinmux_grp mode_mux[] = {
-        {
-                .name = "i2c",
-                .mask = RT305X_GPIO_MODE_I2C,
-                .gpio_first = RT305X_GPIO_I2C_SD,
-                .gpio_last = RT305X_GPIO_I2C_SCLK,
-        }, {
-                .name = "spi",
-                .mask = RT305X_GPIO_MODE_SPI,
-                .gpio_first = RT305X_GPIO_SPI_EN,
-                .gpio_last = RT305X_GPIO_SPI_CLK,
-        }, {
-                .name = "uartlite",
-                .mask = RT305X_GPIO_MODE_UART1,
-                .gpio_first = RT305X_GPIO_UART1_TXD,
-                .gpio_last = RT305X_GPIO_UART1_RXD,
-        }, {
-                .name = "jtag",
-                .mask = RT305X_GPIO_MODE_JTAG,
-                .gpio_first = RT305X_GPIO_JTAG_TDO,
-                .gpio_last = RT305X_GPIO_JTAG_TDI,
-        }, {
-                .name = "mdio",
-                .mask = RT305X_GPIO_MODE_MDIO,
-                .gpio_first = RT305X_GPIO_MDIO_MDC,
-                .gpio_last = RT305X_GPIO_MDIO_MDIO,
-        }, {
-                .name = "sdram",
-                .mask = RT305X_GPIO_MODE_SDRAM,
-                .gpio_first = RT305X_GPIO_SDRAM_MD16,
-                .gpio_last = RT305X_GPIO_SDRAM_MD31,
-        }, {
-                .name = "rgmii",
-                .mask = RT305X_GPIO_MODE_RGMII,
-                .gpio_first = RT305X_GPIO_GE0_TXD0,
-                .gpio_last = RT305X_GPIO_GE0_RXCLK,
-        }, {0}
+static struct rt2880_pmx_func i2c_func[] =  { FUNC("i2c", 0, 1, 2) };
+static struct rt2880_pmx_func spi_func[] = { FUNC("spi", 0, 3, 4) };
+static struct rt2880_pmx_func uartf_func[] = {
+        FUNC("uartf", RT305X_GPIO_MODE_UARTF, 7, 8),
+        FUNC("pcm uartf", RT305X_GPIO_MODE_PCM_UARTF, 7, 8),
+        FUNC("pcm i2s", RT305X_GPIO_MODE_PCM_I2S, 7, 8),
+        FUNC("i2s uartf", RT305X_GPIO_MODE_I2S_UARTF, 7, 8),
+        FUNC("pcm gpio", RT305X_GPIO_MODE_PCM_GPIO, 11, 4),
+        FUNC("gpio uartf", RT305X_GPIO_MODE_GPIO_UARTF, 7, 4),
+        FUNC("gpio i2s", RT305X_GPIO_MODE_GPIO_I2S, 7, 4),
+};
+static struct rt2880_pmx_func uartlite_func[] = { FUNC("uartlite", 0, 15, 2) };
+static struct rt2880_pmx_func jtag_func[] = { FUNC("jtag", 0, 17, 5) };
+static struct rt2880_pmx_func mdio_func[] = { FUNC("mdio", 0, 22, 2) };
+static struct rt2880_pmx_func rt5350_led_func[] = { FUNC("led", 0, 22, 5) };
+static struct rt2880_pmx_func rt5350_cs1_func[] = {
+        FUNC("spi_cs1", 0, 27, 1),
+        FUNC("wdg_cs1", 1, 27, 1),
+};
+static struct rt2880_pmx_func sdram_func[] = { FUNC("sdram", 0, 24, 16) };
+static struct rt2880_pmx_func rt3352_rgmii_func[] = {
+        FUNC("rgmii", 0, 24, 12)
+};
+static struct rt2880_pmx_func rgmii_func[] = { FUNC("rgmii", 0, 40, 12) };
+static struct rt2880_pmx_func rt3352_lna_func[] = { FUNC("lna", 0, 36, 2) };
+static struct rt2880_pmx_func rt3352_pa_func[] = { FUNC("pa", 0, 38, 2) };
+static struct rt2880_pmx_func rt3352_led_func[] = { FUNC("led", 0, 40, 5) };
+
+static struct rt2880_pmx_group rt3050_pinmux_data[] = {
+        GRP("i2c", i2c_func, 1, RT305X_GPIO_MODE_I2C),
+        GRP("spi", spi_func, 1, RT305X_GPIO_MODE_SPI),
+        GRP("uartf", uartf_func, RT305X_GPIO_MODE_UART0_MASK,
+                RT305X_GPIO_MODE_UART0_SHIFT),
+        GRP("uartlite", uartlite_func, 1, RT305X_GPIO_MODE_UART1),
+        GRP("jtag", jtag_func, 1, RT305X_GPIO_MODE_JTAG),
+        GRP("mdio", mdio_func, 1, RT305X_GPIO_MODE_MDIO),
+        GRP("rgmii", rgmii_func, 1, RT305X_GPIO_MODE_RGMII),
+        GRP("sdram", sdram_func, 1, RT305X_GPIO_MODE_SDRAM),
+        { 0 }
 };
 
-static struct ralink_pinmux_grp uart_mux[] = {
-        {
-                .name = "uartf",
-                .mask = RT305X_GPIO_MODE_UARTF,
-                .gpio_first = RT305X_GPIO_7,
-                .gpio_last = RT305X_GPIO_14,
-        }, {
-                .name = "pcm uartf",
-                .mask = RT305X_GPIO_MODE_PCM_UARTF,
-                .gpio_first = RT305X_GPIO_7,
-                .gpio_last = RT305X_GPIO_14,
-        }, {
-                .name = "pcm i2s",
-                .mask = RT305X_GPIO_MODE_PCM_I2S,
-                .gpio_first = RT305X_GPIO_7,
-                .gpio_last = RT305X_GPIO_14,
-        }, {
-                .name = "i2s uartf",
-                .mask = RT305X_GPIO_MODE_I2S_UARTF,
-                .gpio_first = RT305X_GPIO_7,
-                .gpio_last = RT305X_GPIO_14,
-        }, {
-                .name = "pcm gpio",
-                .mask = RT305X_GPIO_MODE_PCM_GPIO,
-                .gpio_first = RT305X_GPIO_10,
-                .gpio_last = RT305X_GPIO_14,
-        }, {
-                .name = "gpio uartf",
-                .mask = RT305X_GPIO_MODE_GPIO_UARTF,
-                .gpio_first = RT305X_GPIO_7,
-                .gpio_last = RT305X_GPIO_10,
-        }, {
-                .name = "gpio i2s",
-                .mask = RT305X_GPIO_MODE_GPIO_I2S,
-                .gpio_first = RT305X_GPIO_7,
-                .gpio_last = RT305X_GPIO_10,
-        }, {
-                .name = "gpio",
-                .mask = RT305X_GPIO_MODE_GPIO,
-        }, {0}
+static struct rt2880_pmx_group rt3352_pinmux_data[] = {
+        GRP("i2c", i2c_func, 1, RT305X_GPIO_MODE_I2C),
+        GRP("spi", spi_func, 1, RT305X_GPIO_MODE_SPI),
+        GRP("uartf", uartf_func, RT305X_GPIO_MODE_UART0_MASK,
+                RT305X_GPIO_MODE_UART0_SHIFT),
+        GRP("uartlite", uartlite_func, 1, RT305X_GPIO_MODE_UART1),
+        GRP("jtag", jtag_func, 1, RT305X_GPIO_MODE_JTAG),
+        GRP("mdio", mdio_func, 1, RT305X_GPIO_MODE_MDIO),
+        GRP("rgmii", rt3352_rgmii_func, 1, RT305X_GPIO_MODE_RGMII),
+        GRP("lna", rt3352_lna_func, 1, RT3352_GPIO_MODE_LNA),
+        GRP("pa", rt3352_pa_func, 1, RT3352_GPIO_MODE_PA),
+        GRP("led", rt3352_led_func, 1, RT5350_GPIO_MODE_PHY_LED),
+        { 0 }
+};
+
+static struct rt2880_pmx_group rt5350_pinmux_data[] = {
+        GRP("i2c", i2c_func, 1, RT305X_GPIO_MODE_I2C),
+        GRP("spi", spi_func, 1, RT305X_GPIO_MODE_SPI),
+        GRP("uartf", uartf_func, RT305X_GPIO_MODE_UART0_MASK,
+                RT305X_GPIO_MODE_UART0_SHIFT),
+        GRP("uartlite", uartlite_func, 1, RT305X_GPIO_MODE_UART1),
+        GRP("jtag", jtag_func, 1, RT305X_GPIO_MODE_JTAG),
+        GRP("led", rt5350_led_func, 1, RT5350_GPIO_MODE_PHY_LED),
+        GRP("spi_cs1", rt5350_cs1_func, 2, RT5350_GPIO_MODE_SPI_CS1),
+        { 0 }
 };
 
 static void rt305x_wdt_reset(void)
@@ -114,14 +102,6 @@ static void rt305x_wdt_reset(void)
         rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG);
 }
 
-struct ralink_pinmux rt_gpio_pinmux = {
-        .mode = mode_mux,
-        .uart = uart_mux,
-        .uart_shift = RT305X_GPIO_MODE_UART0_SHIFT,
-        .uart_mask = RT305X_GPIO_MODE_UART0_MASK,
-        .wdt_reset = rt305x_wdt_reset,
-};
-
 static unsigned long rt5350_get_mem_size(void)
 {
         void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);
@@ -290,11 +270,14 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
         soc_info->mem_base = RT305X_SDRAM_BASE;
         if (soc_is_rt5350()) {
                 soc_info->mem_size = rt5350_get_mem_size();
+                rt2880_pinmux_data = rt5350_pinmux_data;
         } else if (soc_is_rt305x() || soc_is_rt3350()) {
                 soc_info->mem_size_min = RT305X_MEM_SIZE_MIN;
                 soc_info->mem_size_max = RT305X_MEM_SIZE_MAX;
+                rt2880_pinmux_data = rt3050_pinmux_data;
         } else if (soc_is_rt3352()) {
                 soc_info->mem_size_min = RT3352_MEM_SIZE_MIN;
                 soc_info->mem_size_max = RT3352_MEM_SIZE_MAX;
+                rt2880_pinmux_data = rt3352_pinmux_data;
         }
 }