pinctrl: ralink: rename pinctrl-rt288x to pinctrl-rt2880

Rename "pinctrl-rt288x.c" to "pinctrl-rt2880.c" as this is the Ralink
RT2880 pinctrl subdriver. Rename PINCTRL_RT288X symbol to PINCTRL_RT2880.
Rename functions that include "rt288x" to "rt2880".

Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
Reviewed-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Acked-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Link: https://lore.kernel.org/r/20220414173916.5552-5-arinc.unal@arinc9.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/ralink/Kconfig b/drivers/pinctrl/ralink/Kconfig
index d0f0a8f2b9b7de96e31ad2edf84d52cbdf3c5f6c..aa82acfae8276f79475301bc6b723708845f6e6a 100644 (file)
--- a/drivers/pinctrl/ralink/Kconfig
+++ b/drivers/pinctrl/ralink/Kconfig
@@ -17,8 +17,8 @@ config PINCTRL_MT7621
         depends on RALINK && SOC_MT7621
         select PINCTRL_RALINK
 
-config PINCTRL_RT288X
-        bool "RT288X pinctrl driver for RALINK/Mediatek SOCs"
+config PINCTRL_RT2880
+        bool "RT2880 pinctrl driver for RALINK/Mediatek SOCs"
         depends on RALINK && SOC_RT288X
         select PINCTRL_RALINK
 

diff --git a/drivers/pinctrl/ralink/Makefile b/drivers/pinctrl/ralink/Makefile
index 2c1323b74e96f6fa9cf5838014b879eef1feab3d..0ebbe552526d7bfdddb648fcd23ce1f668308c0a 100644 (file)
--- a/drivers/pinctrl/ralink/Makefile
+++ b/drivers/pinctrl/ralink/Makefile
@@ -3,6 +3,6 @@ obj-$(CONFIG_PINCTRL_RALINK)   += pinctrl-ralink.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_RT2880)   += pinctrl-rt2880.o
 obj-$(CONFIG_PINCTRL_RT305X)   += pinctrl-rt305x.o
 obj-$(CONFIG_PINCTRL_RT3883)   += pinctrl-rt3883.o

diff --git a/drivers/pinctrl/ralink/pinctrl-rt2880.c b/drivers/pinctrl/ralink/pinctrl-rt2880.c
new file mode 100644 (file)
index 0000000..9c5e828
--- /dev/null
+++ b/drivers/pinctrl/ralink/pinctrl-rt2880.c
@@ -0,0 +1,60 @@
+// 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 "pinctrl-ralink.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 ralink_pmx_func i2c_func[] = { FUNC("i2c", 0, 1, 2) };
+static struct ralink_pmx_func spi_func[] = { FUNC("spi", 0, 3, 4) };
+static struct ralink_pmx_func uartlite_func[] = { FUNC("uartlite", 0, 7, 8) };
+static struct ralink_pmx_func jtag_func[] = { FUNC("jtag", 0, 17, 5) };
+static struct ralink_pmx_func mdio_func[] = { FUNC("mdio", 0, 22, 2) };
+static struct ralink_pmx_func sdram_func[] = { FUNC("sdram", 0, 24, 16) };
+static struct ralink_pmx_func pci_func[] = { FUNC("pci", 0, 40, 32) };
+
+static struct ralink_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 rt2880_pinctrl_probe(struct platform_device *pdev)
+{
+       return ralink_pinctrl_init(pdev, rt2880_pinmux_data_act);
+}
+
+static const struct of_device_id rt2880_pinctrl_match[] = {
+       { .compatible = "ralink,rt2880-pinmux" },
+       {}
+};
+MODULE_DEVICE_TABLE(of, rt2880_pinctrl_match);
+
+static struct platform_driver rt2880_pinctrl_driver = {
+       .probe = rt2880_pinctrl_probe,
+       .driver = {
+               .name = "rt2880-pinmux",
+               .of_match_table = rt2880_pinctrl_match,
+       },
+};
+
+static int __init rt2880_pinctrl_init(void)
+{
+       return platform_driver_register(&rt2880_pinctrl_driver);
+}
+core_initcall_sync(rt2880_pinctrl_init);

diff --git a/drivers/pinctrl/ralink/pinctrl-rt288x.c b/drivers/pinctrl/ralink/pinctrl-rt288x.c
deleted file mode 100644 (file)
index db5c09e..0000000
--- a/drivers/pinctrl/ralink/pinctrl-rt288x.c
+++ /dev/null
@@ -1,60 +0,0 @@
-// 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 "pinctrl-ralink.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 ralink_pmx_func i2c_func[] = { FUNC("i2c", 0, 1, 2) };
-static struct ralink_pmx_func spi_func[] = { FUNC("spi", 0, 3, 4) };
-static struct ralink_pmx_func uartlite_func[] = { FUNC("uartlite", 0, 7, 8) };
-static struct ralink_pmx_func jtag_func[] = { FUNC("jtag", 0, 17, 5) };
-static struct ralink_pmx_func mdio_func[] = { FUNC("mdio", 0, 22, 2) };
-static struct ralink_pmx_func sdram_func[] = { FUNC("sdram", 0, 24, 16) };
-static struct ralink_pmx_func pci_func[] = { FUNC("pci", 0, 40, 32) };
-
-static struct ralink_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_pinctrl_probe(struct platform_device *pdev)
-{
-       return ralink_pinctrl_init(pdev, rt2880_pinmux_data_act);
-}
-
-static const struct of_device_id rt288x_pinctrl_match[] = {
-       { .compatible = "ralink,rt2880-pinmux" },
-       {}
-};
-MODULE_DEVICE_TABLE(of, rt288x_pinctrl_match);
-
-static struct platform_driver rt288x_pinctrl_driver = {
-       .probe = rt288x_pinctrl_probe,
-       .driver = {
-               .name = "rt2880-pinmux",
-               .of_match_table = rt288x_pinctrl_match,
-       },
-};
-
-static int __init rt288x_pinctrl_init(void)
-{
-       return platform_driver_register(&rt288x_pinctrl_driver);
-}
-core_initcall_sync(rt288x_pinctrl_init);