xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MIPS: ralink: cleanup the soc specific pinmux data

Browse Source 
Before we had a pinctrl driver we used a custom OF api. This patch converts the
soc specific pinmux data to a new set of structs. We also add some new pinmux
setings.

Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/8009/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
John Crispin
2014-10-09 04:02:53 +02:00
committed by Ralf Baechle
parent 4248f7f121
commit f576fb6a07
10 changed files with 294 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
arch/mips/ralink/rt3883.c
View File

@@ -17,132 +17,50 @@
#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 ralink_pinmux_grp mode_mux[] = {
{
.name = "i2c",
.mask = RT3883_GPIO_MODE_I2C,
.gpio_first = RT3883_GPIO_I2C_SD,
.gpio_last = RT3883_GPIO_I2C_SCLK,
}, {
.name = "spi",
.mask = RT3883_GPIO_MODE_SPI,
.gpio_first = RT3883_GPIO_SPI_CS0,
.gpio_last = RT3883_GPIO_SPI_MISO,
}, {
.name = "uartlite",
.mask = RT3883_GPIO_MODE_UART1,
.gpio_first = RT3883_GPIO_UART1_TXD,
.gpio_last = RT3883_GPIO_UART1_RXD,
}, {
.name = "jtag",
.mask = RT3883_GPIO_MODE_JTAG,
.gpio_first = RT3883_GPIO_JTAG_TDO,
.gpio_last = RT3883_GPIO_JTAG_TCLK,
}, {
.name = "mdio",
.mask = RT3883_GPIO_MODE_MDIO,
.gpio_first = RT3883_GPIO_MDIO_MDC,
.gpio_last = RT3883_GPIO_MDIO_MDIO,
}, {
.name = "ge1",
.mask = RT3883_GPIO_MODE_GE1,
.gpio_first = RT3883_GPIO_GE1_TXD0,
.gpio_last = RT3883_GPIO_GE1_RXCLK,
}, {
.name = "ge2",
.mask = RT3883_GPIO_MODE_GE2,
.gpio_first = RT3883_GPIO_GE2_TXD0,
.gpio_last = RT3883_GPIO_GE2_RXCLK,
}, {
.name = "pci",
.mask = RT3883_GPIO_MODE_PCI,
.gpio_first = RT3883_GPIO_PCI_AD0,
.gpio_last = RT3883_GPIO_PCI_AD31,
}, {
.name = "lna a",
.mask = RT3883_GPIO_MODE_LNA_A,
.gpio_first = RT3883_GPIO_LNA_PE_A0,
.gpio_last = RT3883_GPIO_LNA_PE_A2,
}, {
.name = "lna g",
.mask = RT3883_GPIO_MODE_LNA_G,
.gpio_first = RT3883_GPIO_LNA_PE_G0,
.gpio_last = RT3883_GPIO_LNA_PE_G2,
}, {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", 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 ralink_pinmux_grp uart_mux[] = {
{
.name = "uartf",
.mask = RT3883_GPIO_MODE_UARTF,
.gpio_first = RT3883_GPIO_7,
.gpio_last = RT3883_GPIO_14,
}, {
.name = "pcm uartf",
.mask = RT3883_GPIO_MODE_PCM_UARTF,
.gpio_first = RT3883_GPIO_7,
.gpio_last = RT3883_GPIO_14,
}, {
.name = "pcm i2s",
.mask = RT3883_GPIO_MODE_PCM_I2S,
.gpio_first = RT3883_GPIO_7,
.gpio_last = RT3883_GPIO_14,
}, {
.name = "i2s uartf",
.mask = RT3883_GPIO_MODE_I2S_UARTF,
.gpio_first = RT3883_GPIO_7,
.gpio_last = RT3883_GPIO_14,
}, {
.name = "pcm gpio",
.mask = RT3883_GPIO_MODE_PCM_GPIO,
.gpio_first = RT3883_GPIO_11,
.gpio_last = RT3883_GPIO_14,
}, {
.name = "gpio uartf",
.mask = RT3883_GPIO_MODE_GPIO_UARTF,
.gpio_first = RT3883_GPIO_7,
.gpio_last = RT3883_GPIO_10,
}, {
.name = "gpio i2s",
.mask = RT3883_GPIO_MODE_GPIO_I2S,
.gpio_first = RT3883_GPIO_7,
.gpio_last = RT3883_GPIO_10,
}, {
.name = "gpio",
.mask = RT3883_GPIO_MODE_GPIO,
}, {0}
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 a", 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("ge1", 0, 84, 12) };
static struct ralink_pinmux_grp pci_mux[] = {
{
.name = "pci-dev",
.mask = 0,
.gpio_first = RT3883_GPIO_PCI_AD0,
.gpio_last = RT3883_GPIO_PCI_AD31,
}, {
.name = "pci-host2",
.mask = 1,
.gpio_first = RT3883_GPIO_PCI_AD0,
.gpio_last = RT3883_GPIO_PCI_AD31,
}, {
.name = "pci-host1",
.mask = 2,
.gpio_first = RT3883_GPIO_PCI_AD0,
.gpio_last = RT3883_GPIO_PCI_AD31,
}, {
.name = "pci-fnc",
.mask = 3,
.gpio_first = RT3883_GPIO_PCI_AD0,
.gpio_last = RT3883_GPIO_PCI_AD31,
}, {
.name = "pci-gpio",
.mask = 7,
.gpio_first = RT3883_GPIO_PCI_AD0,
.gpio_last = RT3883_GPIO_PCI_AD31,
}, {0}
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 }
};
static void rt3883_wdt_reset(void)
@@ -155,17 +73,6 @@ static void rt3883_wdt_reset(void)
rt_sysc_w32(t, RT3883_SYSC_REG_SYSCFG1);
}
struct ralink_pinmux rt_gpio_pinmux = {
.mode = mode_mux,
.uart = uart_mux,
.uart_shift = RT3883_GPIO_MODE_UART0_SHIFT,
.uart_mask = RT3883_GPIO_MODE_UART0_MASK,
.wdt_reset = rt3883_wdt_reset,
.pci = pci_mux,
.pci_shift = RT3883_GPIO_MODE_PCI_SHIFT,
.pci_mask = RT3883_GPIO_MODE_PCI_MASK,
};
void __init ralink_clk_init(void)
{
unsigned long cpu_rate, sys_rate;
@@ -244,4 +151,6 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
soc_info->mem_base = RT3883_SDRAM_BASE;
soc_info->mem_size_min = RT3883_MEM_SIZE_MIN;
soc_info->mem_size_max = RT3883_MEM_SIZE_MAX;
rt2880_pinmux_data = rt3883_pinmux_data;
}