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

pinctrl: ralink: move RT288X SoC pinmux config into a new 'pinctrl-rt288x.c' file 



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

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


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

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

+0 −9
Original line number Diff line number Diff line
@@ -33,15 +33,6 @@ 
#define SYSTEM_CONFIG_CPUCLK_280	0x2

#define SYSTEM_CONFIG_CPUCLK_300	0x3



#define RT2880_GPIO_MODE_I2C		BIT(0)

#define RT2880_GPIO_MODE_UART0		BIT(1)

#define RT2880_GPIO_MODE_SPI		BIT(2)

#define RT2880_GPIO_MODE_UART1		BIT(3)

#define RT2880_GPIO_MODE_JTAG		BIT(4)

#define RT2880_GPIO_MODE_MDIO		BIT(5)

#define RT2880_GPIO_MODE_SDRAM		BIT(6)

#define RT2880_GPIO_MODE_PCI		BIT(7)



#define CLKCFG_SRAM_CS_N_WDT		BIT(9)



#define RT2880_SDRAM_BASE		0x08000000

arch/mips/ralink/rt288x.c

+0 −21
Original line number Diff line number Diff line
@@ -14,29 +14,9 @@ 
#include <asm/mipsregs.h>

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

#include <asm/mach-ralink/rt288x.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 uartlite_func[] = { FUNC("uartlite", 0, 7, 8) };

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 sdram_func[] = { FUNC("sdram", 0, 24, 16) };

static struct rt2880_pmx_func pci_func[] = { FUNC("pci", 0, 40, 32) };



static struct rt2880_pmx_group rt2880_pinmux_data_act[] = {

	GRP("i2c", i2c_func, 1, RT2880_GPIO_MODE_I2C),

	GRP("spi", spi_func, 1, RT2880_GPIO_MODE_SPI),

	GRP("uartlite", uartlite_func, 1, RT2880_GPIO_MODE_UART0),

	GRP("jtag", jtag_func, 1, RT2880_GPIO_MODE_JTAG),

	GRP("mdio", mdio_func, 1, RT2880_GPIO_MODE_MDIO),

	GRP("sdram", sdram_func, 1, RT2880_GPIO_MODE_SDRAM),

	GRP("pci", pci_func, 1, RT2880_GPIO_MODE_PCI),

	{ 0 }

};



void __init ralink_clk_init(void)

{

	unsigned long cpu_rate, wmac_rate = 40000000;
@@ -106,6 +86,5 @@ void __init prom_soc_init(struct ralink_soc_info *soc_info) 
	soc_info->mem_size_min = RT2880_MEM_SIZE_MIN;

	soc_info->mem_size_max = RT2880_MEM_SIZE_MAX;



	rt2880_pinmux_data = rt2880_pinmux_data_act;

	ralink_soc = RT2880_SOC;

}

drivers/pinctrl/ralink/Kconfig

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

        select PINCTRL_RT2880



config PINCTRL_RT288X

        bool "RT288X pinctrl driver for RALINK/Mediatek SOCs"

        depends on RALINK && SOC_RT288X

        select PINCTRL_RT2880



config PINCTRL_RT305X

        bool "RT305X pinctrl driver for RALINK/Mediatek SOCs"

        depends on RALINK && SOC_RT305X

drivers/pinctrl/ralink/Makefile

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


obj-$(CONFIG_PINCTRL_MT7620)   += pinctrl-mt7620.o

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

obj-$(CONFIG_PINCTRL_RT288X)   += pinctrl-rt288x.o

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

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

drivers/pinctrl/ralink/pinctrl-rt288x.c

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



#include <linux/bitops.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/of.h>

#include "pinmux.h"



#define RT2880_GPIO_MODE_I2C		BIT(0)

#define RT2880_GPIO_MODE_UART0		BIT(1)

#define RT2880_GPIO_MODE_SPI		BIT(2)

#define RT2880_GPIO_MODE_UART1		BIT(3)

#define RT2880_GPIO_MODE_JTAG		BIT(4)

#define RT2880_GPIO_MODE_MDIO		BIT(5)

#define RT2880_GPIO_MODE_SDRAM		BIT(6)

#define RT2880_GPIO_MODE_PCI		BIT(7)



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 uartlite_func[] = { FUNC("uartlite", 0, 7, 8) };

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 sdram_func[] = { FUNC("sdram", 0, 24, 16) };

static struct rt2880_pmx_func pci_func[] = { FUNC("pci", 0, 40, 32) };



static struct rt2880_pmx_group rt2880_pinmux_data_act[] = {

	GRP("i2c", i2c_func, 1, RT2880_GPIO_MODE_I2C),

	GRP("spi", spi_func, 1, RT2880_GPIO_MODE_SPI),

	GRP("uartlite", uartlite_func, 1, RT2880_GPIO_MODE_UART0),

	GRP("jtag", jtag_func, 1, RT2880_GPIO_MODE_JTAG),

	GRP("mdio", mdio_func, 1, RT2880_GPIO_MODE_MDIO),

	GRP("sdram", sdram_func, 1, RT2880_GPIO_MODE_SDRAM),

	GRP("pci", pci_func, 1, RT2880_GPIO_MODE_PCI),

	{ 0 }

};



static int rt288x_pinmux_probe(struct platform_device *pdev)

{

	return rt2880_pinmux_init(pdev, rt2880_pinmux_data_act);

}



static const struct of_device_id rt288x_pinmux_match[] = {

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

	{}

};

MODULE_DEVICE_TABLE(of, rt288x_pinmux_match);



static struct platform_driver rt288x_pinmux_driver = {

	.probe = rt288x_pinmux_probe,

	.driver = {

		.name = "rt2880-pinmux",

		.of_match_table = rt288x_pinmux_match,

	},

};



static int __init rt288x_pinmux_init(void)

{

	return platform_driver_register(&rt288x_pinmux_driver);

}

core_initcall_sync(rt288x_pinmux_init);