Merge tag 'dmaengine-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[linux-2.6-microblaze.git] / arch / mips / ralink / rt3883.c

diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c
index ff91f35..d9875f1 100644 (file)
--- a/arch/mips/ralink/rt3883.c
+++ b/arch/mips/ralink/rt3883.c
@@ -14,52 +14,9 @@
 #include <asm/mipsregs.h>
 #include <asm/mach-ralink/ralink_regs.h>
 #include <asm/mach-ralink/rt3883.h>
-#include <asm/mach-ralink/pinmux.h>
 
 #include "common.h"
 
-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", RT3883_GPIO_MODE_UARTF, 7, 8),
-       FUNC("pcm uartf", RT3883_GPIO_MODE_PCM_UARTF, 7, 8),
-       FUNC("pcm i2s", RT3883_GPIO_MODE_PCM_I2S, 7, 8),
-       FUNC("i2s uartf", RT3883_GPIO_MODE_I2S_UARTF, 7, 8),
-       FUNC("pcm gpio", RT3883_GPIO_MODE_PCM_GPIO, 11, 4),
-       FUNC("gpio uartf", RT3883_GPIO_MODE_GPIO_UARTF, 7, 4),
-       FUNC("gpio i2s", RT3883_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 lna_a_func[] = { FUNC("lna a", 0, 32, 3) };
-static struct rt2880_pmx_func lna_g_func[] = { FUNC("lna g", 0, 35, 3) };
-static struct rt2880_pmx_func pci_func[] = {
-       FUNC("pci-dev", 0, 40, 32),
-       FUNC("pci-host2", 1, 40, 32),
-       FUNC("pci-host1", 2, 40, 32),
-       FUNC("pci-fnc", 3, 40, 32)
-};
-static struct rt2880_pmx_func ge1_func[] = { FUNC("ge1", 0, 72, 12) };
-static struct rt2880_pmx_func ge2_func[] = { FUNC("ge2", 0, 84, 12) };
-
-static struct rt2880_pmx_group rt3883_pinmux_data[] = {
-       GRP("i2c", i2c_func, 1, RT3883_GPIO_MODE_I2C),
-       GRP("spi", spi_func, 1, RT3883_GPIO_MODE_SPI),
-       GRP("uartf", uartf_func, RT3883_GPIO_MODE_UART0_MASK,
-               RT3883_GPIO_MODE_UART0_SHIFT),
-       GRP("uartlite", uartlite_func, 1, RT3883_GPIO_MODE_UART1),
-       GRP("jtag", jtag_func, 1, RT3883_GPIO_MODE_JTAG),
-       GRP("mdio", mdio_func, 1, RT3883_GPIO_MODE_MDIO),
-       GRP("lna a", lna_a_func, 1, RT3883_GPIO_MODE_LNA_A),
-       GRP("lna g", lna_g_func, 1, RT3883_GPIO_MODE_LNA_G),
-       GRP("pci", pci_func, RT3883_GPIO_MODE_PCI_MASK,
-               RT3883_GPIO_MODE_PCI_SHIFT),
-       GRP("ge1", ge1_func, 1, RT3883_GPIO_MODE_GE1),
-       GRP("ge2", ge2_func, 1, RT3883_GPIO_MODE_GE2),
-       { 0 }
-};
-
 void __init ralink_clk_init(void)
 {
        unsigned long cpu_rate, sys_rate;
@@ -142,7 +99,5 @@ void __init prom_soc_init(struct ralink_soc_info *soc_info)
        soc_info->mem_size_min = RT3883_MEM_SIZE_MIN;
        soc_info->mem_size_max = RT3883_MEM_SIZE_MAX;
 
-       rt2880_pinmux_data = rt3883_pinmux_data;
-
        ralink_soc = RT3883_SOC;
 }