Commit 3a1b0ca5 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Linus Walleij
Browse files

pinctrl: ralink: move RT305X SoC pinmux config into a new 'pinctrl-rt305x.c' file 



Move all related code for SoC RT305X into a new driver located
in 'pinctrl-rt305x.c' source file.

Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Link: https://lore.kernel.org/r/20210604115159.8834-5-sergio.paracuellos@gmail.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8b8b0fa2

arch/mips/include/asm/mach-ralink/rt305x.h

+0 −24
Original line number Diff line number Diff line
@@ -114,30 +114,6 @@ static inline int soc_is_rt5350(void) 
#define RT305X_GPIO_GE0_TXD0		40

#define RT305X_GPIO_GE0_RXCLK		51



#define RT305X_GPIO_MODE_UART0_SHIFT	2

#define RT305X_GPIO_MODE_UART0_MASK	0x7

#define RT305X_GPIO_MODE_UART0(x)	((x) << RT305X_GPIO_MODE_UART0_SHIFT)

#define RT305X_GPIO_MODE_UARTF		0

#define RT305X_GPIO_MODE_PCM_UARTF	1

#define RT305X_GPIO_MODE_PCM_I2S	2

#define RT305X_GPIO_MODE_I2S_UARTF	3

#define RT305X_GPIO_MODE_PCM_GPIO	4

#define RT305X_GPIO_MODE_GPIO_UARTF	5

#define RT305X_GPIO_MODE_GPIO_I2S	6

#define RT305X_GPIO_MODE_GPIO		7



#define RT305X_GPIO_MODE_I2C		0

#define RT305X_GPIO_MODE_SPI		1

#define RT305X_GPIO_MODE_UART1		5

#define RT305X_GPIO_MODE_JTAG		6

#define RT305X_GPIO_MODE_MDIO		7

#define RT305X_GPIO_MODE_SDRAM		8

#define RT305X_GPIO_MODE_RGMII		9

#define RT5350_GPIO_MODE_PHY_LED	14

#define RT5350_GPIO_MODE_SPI_CS1	21

#define RT3352_GPIO_MODE_LNA		18

#define RT3352_GPIO_MODE_PA		20



#define RT3352_SYSC_REG_SYSCFG0		0x010

#define RT3352_SYSC_REG_SYSCFG1         0x014

#define RT3352_SYSC_REG_CLKCFG1         0x030

arch/mips/ralink/rt305x.c

+0 −77
Original line number Diff line number Diff line
@@ -16,83 +16,9 @@ 
#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"



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_func rt3352_cs1_func[] = {

	FUNC("spi_cs1", 0, 45, 1),

	FUNC("wdg_cs1", 1, 45, 1),

};



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 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),

	GRP("spi_cs1", rt3352_cs1_func, 2, RT5350_GPIO_MODE_SPI_CS1),

	{ 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 unsigned long rt5350_get_mem_size(void)

{

	void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);
@@ -265,14 +191,11 @@ void __init 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;

	}

}

drivers/pinctrl/ralink/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ config PINCTRL_MT7621 
        depends on RALINK && SOC_MT7621

        select PINCTRL_RT2880



config PINCTRL_RT305X

        bool "RT305X pinctrl driver for RALINK/Mediatek SOCs"

        depends on RALINK && SOC_RT305X

        select PINCTRL_RT2880



config PINCTRL_RT3883

        bool "RT3883 pinctrl driver for RALINK/Mediatek SOCs"

        depends on RALINK && SOC_RT3883

drivers/pinctrl/ralink/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ 
obj-$(CONFIG_PINCTRL_RT2880)   += pinctrl-rt2880.o



obj-$(CONFIG_PINCTRL_MT7621)   += pinctrl-mt7621.o

obj-$(CONFIG_PINCTRL_RT305X)   += pinctrl-rt305x.o

obj-$(CONFIG_PINCTRL_RT3883)   += pinctrl-rt3883.o

drivers/pinctrl/ralink/pinctrl-rt305x.c

0 → 100644
+136 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only



#include <asm/mach-ralink/rt305x.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/of.h>

#include "pinmux.h"



#define RT305X_GPIO_MODE_UART0_SHIFT	2

#define RT305X_GPIO_MODE_UART0_MASK	0x7

#define RT305X_GPIO_MODE_UART0(x)	((x) << RT305X_GPIO_MODE_UART0_SHIFT)

#define RT305X_GPIO_MODE_UARTF		0

#define RT305X_GPIO_MODE_PCM_UARTF	1

#define RT305X_GPIO_MODE_PCM_I2S	2

#define RT305X_GPIO_MODE_I2S_UARTF	3

#define RT305X_GPIO_MODE_PCM_GPIO	4

#define RT305X_GPIO_MODE_GPIO_UARTF	5

#define RT305X_GPIO_MODE_GPIO_I2S	6

#define RT305X_GPIO_MODE_GPIO		7



#define RT305X_GPIO_MODE_I2C		0

#define RT305X_GPIO_MODE_SPI		1

#define RT305X_GPIO_MODE_UART1		5

#define RT305X_GPIO_MODE_JTAG		6

#define RT305X_GPIO_MODE_MDIO		7

#define RT305X_GPIO_MODE_SDRAM		8

#define RT305X_GPIO_MODE_RGMII		9

#define RT5350_GPIO_MODE_PHY_LED	14

#define RT5350_GPIO_MODE_SPI_CS1	21

#define RT3352_GPIO_MODE_LNA		18

#define RT3352_GPIO_MODE_PA		20



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_func rt3352_cs1_func[] = {

	FUNC("spi_cs1", 0, 45, 1),

	FUNC("wdg_cs1", 1, 45, 1),

};



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 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),

	GRP("spi_cs1", rt3352_cs1_func, 2, RT5350_GPIO_MODE_SPI_CS1),

	{ 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 int rt305x_pinmux_probe(struct platform_device *pdev)

{

	if (soc_is_rt5350())

		return rt2880_pinmux_init(pdev, rt5350_pinmux_data);

	else if (soc_is_rt305x() || soc_is_rt3350())

		return rt2880_pinmux_init(pdev, rt3050_pinmux_data);

	else if (soc_is_rt3352())

		return rt2880_pinmux_init(pdev, rt3352_pinmux_data);

	else

		return -EINVAL;

}



static const struct of_device_id rt305x_pinmux_match[] = {

	{ .compatible = "ralink,rt2880-pinmux" },

	{}

};

MODULE_DEVICE_TABLE(of, rt305x_pinmux_match);



static struct platform_driver rt305x_pinmux_driver = {

	.probe = rt305x_pinmux_probe,

	.driver = {

		.name = "rt2880-pinmux",

		.of_match_table = rt305x_pinmux_match,

	},

};



static int __init rt305x_pinmux_init(void)

{

	return platform_driver_register(&rt305x_pinmux_driver);

}

core_initcall_sync(rt305x_pinmux_init);