pinctrl: ralink: rename variables which point out the pin group

These variables define a list of functions which can be muxed to the pin
group which the name of the pin group was originally intended to be pointed
out on the name of the said variables.

Therefore, rename "func" to "grp" across all subdrivers where this applies.

Fixes: 18653d4bd8ab ("pinctrl: ralink: rename variable names for functions on MT7620 and MT7621")
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
Acked-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Link: https://lore.kernel.org/r/20221231160849.40544-2-arinc.unal@arinc9.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/ralink/pinctrl-mt7620.c b/drivers/pinctrl/ralink/pinctrl-mt7620.c
index 22ff16eff02ff92ab58f6dffed134e68f646f55a..4e8d26bb343020f933314ac235bea3d846e3c1df 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-mt7620.c
+++ b/drivers/pinctrl/ralink/pinctrl-mt7620.c
@@ -54,20 +54,20 @@
 #define MT7620_GPIO_MODE_EPHY          15
 #define MT7620_GPIO_MODE_PA            20
 
-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, 15, 2) };
-static struct ralink_pmx_func mdio_func[] = {
+static struct ralink_pmx_func i2c_grp[] =  { FUNC("i2c", 0, 1, 2) };
+static struct ralink_pmx_func spi_grp[] = { FUNC("spi", 0, 3, 4) };
+static struct ralink_pmx_func uartlite_grp[] = { FUNC("uartlite", 0, 15, 2) };
+static struct ralink_pmx_func mdio_grp[] = {
        FUNC("mdio", MT7620_GPIO_MODE_MDIO, 22, 2),
        FUNC("refclk", MT7620_GPIO_MODE_MDIO_REFCLK, 22, 2),
 };
-static struct ralink_pmx_func rgmii1_func[] = { FUNC("rgmii1", 0, 24, 12) };
-static struct ralink_pmx_func refclk_func[] = { FUNC("spi refclk", 0, 37, 3) };
-static struct ralink_pmx_func ephy_func[] = { FUNC("ephy", 0, 40, 5) };
-static struct ralink_pmx_func rgmii2_func[] = { FUNC("rgmii2", 0, 60, 12) };
-static struct ralink_pmx_func wled_func[] = { FUNC("wled", 0, 72, 1) };
-static struct ralink_pmx_func pa_func[] = { FUNC("pa", 0, 18, 4) };
-static struct ralink_pmx_func uartf_func[] = {
+static struct ralink_pmx_func rgmii1_grp[] = { FUNC("rgmii1", 0, 24, 12) };
+static struct ralink_pmx_func refclk_grp[] = { FUNC("spi refclk", 0, 37, 3) };
+static struct ralink_pmx_func ephy_grp[] = { FUNC("ephy", 0, 40, 5) };
+static struct ralink_pmx_func rgmii2_grp[] = { FUNC("rgmii2", 0, 60, 12) };
+static struct ralink_pmx_func wled_grp[] = { FUNC("wled", 0, 72, 1) };
+static struct ralink_pmx_func pa_grp[] = { FUNC("pa", 0, 18, 4) };
+static struct ralink_pmx_func uartf_grp[] = {
        FUNC("uartf", MT7620_GPIO_MODE_UARTF, 7, 8),
        FUNC("pcm uartf", MT7620_GPIO_MODE_PCM_UARTF, 7, 8),
        FUNC("pcm i2s", MT7620_GPIO_MODE_PCM_I2S, 7, 8),
@@ -76,202 +76,202 @@ static struct ralink_pmx_func uartf_func[] = {
        FUNC("gpio uartf", MT7620_GPIO_MODE_GPIO_UARTF, 7, 4),
        FUNC("gpio i2s", MT7620_GPIO_MODE_GPIO_I2S, 7, 4),
 };
-static struct ralink_pmx_func wdt_func[] = {
+static struct ralink_pmx_func wdt_grp[] = {
        FUNC("wdt rst", 0, 17, 1),
        FUNC("wdt refclk", 0, 17, 1),
        };
-static struct ralink_pmx_func pcie_rst_func[] = {
+static struct ralink_pmx_func pcie_rst_grp[] = {
        FUNC("pcie rst", MT7620_GPIO_MODE_PCIE_RST, 36, 1),
        FUNC("pcie refclk", MT7620_GPIO_MODE_PCIE_REF, 36, 1)
 };
-static struct ralink_pmx_func nd_sd_func[] = {
+static struct ralink_pmx_func nd_sd_grp[] = {
        FUNC("nand", MT7620_GPIO_MODE_NAND, 45, 15),
        FUNC("sd", MT7620_GPIO_MODE_SD, 47, 13)
 };
 
 static struct ralink_pmx_group mt7620a_pinmux_data[] = {
-       GRP("i2c", i2c_func, 1, MT7620_GPIO_MODE_I2C),
-       GRP("uartf", uartf_func, MT7620_GPIO_MODE_UART0_MASK,
+       GRP("i2c", i2c_grp, 1, MT7620_GPIO_MODE_I2C),
+       GRP("uartf", uartf_grp, MT7620_GPIO_MODE_UART0_MASK,
                MT7620_GPIO_MODE_UART0_SHIFT),
-       GRP("spi", spi_func, 1, MT7620_GPIO_MODE_SPI),
-       GRP("uartlite", uartlite_func, 1, MT7620_GPIO_MODE_UART1),
-       GRP_G("wdt", wdt_func, MT7620_GPIO_MODE_WDT_MASK,
+       GRP("spi", spi_grp, 1, MT7620_GPIO_MODE_SPI),
+       GRP("uartlite", uartlite_grp, 1, MT7620_GPIO_MODE_UART1),
+       GRP_G("wdt", wdt_grp, MT7620_GPIO_MODE_WDT_MASK,
                MT7620_GPIO_MODE_WDT_GPIO, MT7620_GPIO_MODE_WDT_SHIFT),
-       GRP_G("mdio", mdio_func, MT7620_GPIO_MODE_MDIO_MASK,
+       GRP_G("mdio", mdio_grp, MT7620_GPIO_MODE_MDIO_MASK,
                MT7620_GPIO_MODE_MDIO_GPIO, MT7620_GPIO_MODE_MDIO_SHIFT),
-       GRP("rgmii1", rgmii1_func, 1, MT7620_GPIO_MODE_RGMII1),
-       GRP("spi refclk", refclk_func, 1, MT7620_GPIO_MODE_SPI_REF_CLK),
-       GRP_G("pcie", pcie_rst_func, MT7620_GPIO_MODE_PCIE_MASK,
+       GRP("rgmii1", rgmii1_grp, 1, MT7620_GPIO_MODE_RGMII1),
+       GRP("spi refclk", refclk_grp, 1, MT7620_GPIO_MODE_SPI_REF_CLK),
+       GRP_G("pcie", pcie_rst_grp, MT7620_GPIO_MODE_PCIE_MASK,
                MT7620_GPIO_MODE_PCIE_GPIO, MT7620_GPIO_MODE_PCIE_SHIFT),
-       GRP_G("nd_sd", nd_sd_func, MT7620_GPIO_MODE_ND_SD_MASK,
+       GRP_G("nd_sd", nd_sd_grp, MT7620_GPIO_MODE_ND_SD_MASK,
                MT7620_GPIO_MODE_ND_SD_GPIO, MT7620_GPIO_MODE_ND_SD_SHIFT),
-       GRP("rgmii2", rgmii2_func, 1, MT7620_GPIO_MODE_RGMII2),
-       GRP("wled", wled_func, 1, MT7620_GPIO_MODE_WLED),
-       GRP("ephy", ephy_func, 1, MT7620_GPIO_MODE_EPHY),
-       GRP("pa", pa_func, 1, MT7620_GPIO_MODE_PA),
+       GRP("rgmii2", rgmii2_grp, 1, MT7620_GPIO_MODE_RGMII2),
+       GRP("wled", wled_grp, 1, MT7620_GPIO_MODE_WLED),
+       GRP("ephy", ephy_grp, 1, MT7620_GPIO_MODE_EPHY),
+       GRP("pa", pa_grp, 1, MT7620_GPIO_MODE_PA),
        { 0 }
 };
 
-static struct ralink_pmx_func pwm1_func_mt76x8[] = {
+static struct ralink_pmx_func pwm1_grp_mt76x8[] = {
        FUNC("sdxc d6", 3, 19, 1),
        FUNC("utif", 2, 19, 1),
        FUNC("gpio", 1, 19, 1),
        FUNC("pwm1", 0, 19, 1),
 };
 
-static struct ralink_pmx_func pwm0_func_mt76x8[] = {
+static struct ralink_pmx_func pwm0_grp_mt76x8[] = {
        FUNC("sdxc d7", 3, 18, 1),
        FUNC("utif", 2, 18, 1),
        FUNC("gpio", 1, 18, 1),
        FUNC("pwm0", 0, 18, 1),
 };
 
-static struct ralink_pmx_func uart2_func_mt76x8[] = {
+static struct ralink_pmx_func uart2_grp_mt76x8[] = {
        FUNC("sdxc d5 d4", 3, 20, 2),
        FUNC("pwm", 2, 20, 2),
        FUNC("gpio", 1, 20, 2),
        FUNC("uart2", 0, 20, 2),
 };
 
-static struct ralink_pmx_func uart1_func_mt76x8[] = {
+static struct ralink_pmx_func uart1_grp_mt76x8[] = {
        FUNC("sw_r", 3, 45, 2),
        FUNC("pwm", 2, 45, 2),
        FUNC("gpio", 1, 45, 2),
        FUNC("uart1", 0, 45, 2),
 };
 
-static struct ralink_pmx_func i2c_func_mt76x8[] = {
+static struct ralink_pmx_func i2c_grp_mt76x8[] = {
        FUNC("-", 3, 4, 2),
        FUNC("debug", 2, 4, 2),
        FUNC("gpio", 1, 4, 2),
        FUNC("i2c", 0, 4, 2),
 };
 
-static struct ralink_pmx_func refclk_func_mt76x8[] = { FUNC("refclk", 0, 37, 1) };
-static struct ralink_pmx_func perst_func_mt76x8[] = { FUNC("perst", 0, 36, 1) };
-static struct ralink_pmx_func wdt_func_mt76x8[] = { FUNC("wdt", 0, 38, 1) };
-static struct ralink_pmx_func spi_func_mt76x8[] = { FUNC("spi", 0, 7, 4) };
+static struct ralink_pmx_func refclk_grp_mt76x8[] = { FUNC("refclk", 0, 37, 1) };
+static struct ralink_pmx_func perst_grp_mt76x8[] = { FUNC("perst", 0, 36, 1) };
+static struct ralink_pmx_func wdt_grp_mt76x8[] = { FUNC("wdt", 0, 38, 1) };
+static struct ralink_pmx_func spi_grp_mt76x8[] = { FUNC("spi", 0, 7, 4) };
 
-static struct ralink_pmx_func sd_mode_func_mt76x8[] = {
+static struct ralink_pmx_func sd_mode_grp_mt76x8[] = {
        FUNC("jtag", 3, 22, 8),
        FUNC("utif", 2, 22, 8),
        FUNC("gpio", 1, 22, 8),
        FUNC("sdxc", 0, 22, 8),
 };
 
-static struct ralink_pmx_func uart0_func_mt76x8[] = {
+static struct ralink_pmx_func uart0_grp_mt76x8[] = {
        FUNC("-", 3, 12, 2),
        FUNC("-", 2, 12, 2),
        FUNC("gpio", 1, 12, 2),
        FUNC("uart0", 0, 12, 2),
 };
 
-static struct ralink_pmx_func i2s_func_mt76x8[] = {
+static struct ralink_pmx_func i2s_grp_mt76x8[] = {
        FUNC("antenna", 3, 0, 4),
        FUNC("pcm", 2, 0, 4),
        FUNC("gpio", 1, 0, 4),
        FUNC("i2s", 0, 0, 4),
 };
 
-static struct ralink_pmx_func spi_cs1_func_mt76x8[] = {
+static struct ralink_pmx_func spi_cs1_grp_mt76x8[] = {
        FUNC("-", 3, 6, 1),
        FUNC("refclk", 2, 6, 1),
        FUNC("gpio", 1, 6, 1),
        FUNC("spi cs1", 0, 6, 1),
 };
 
-static struct ralink_pmx_func spis_func_mt76x8[] = {
+static struct ralink_pmx_func spis_grp_mt76x8[] = {
        FUNC("pwm_uart2", 3, 14, 4),
        FUNC("utif", 2, 14, 4),
        FUNC("gpio", 1, 14, 4),
        FUNC("spis", 0, 14, 4),
 };
 
-static struct ralink_pmx_func gpio_func_mt76x8[] = {
+static struct ralink_pmx_func gpio_grp_mt76x8[] = {
        FUNC("pcie", 3, 11, 1),
        FUNC("refclk", 2, 11, 1),
        FUNC("gpio", 1, 11, 1),
        FUNC("gpio", 0, 11, 1),
 };
 
-static struct ralink_pmx_func p4led_kn_func_mt76x8[] = {
+static struct ralink_pmx_func p4led_kn_grp_mt76x8[] = {
        FUNC("jtag", 3, 30, 1),
        FUNC("utif", 2, 30, 1),
        FUNC("gpio", 1, 30, 1),
        FUNC("p4led_kn", 0, 30, 1),
 };
 
-static struct ralink_pmx_func p3led_kn_func_mt76x8[] = {
+static struct ralink_pmx_func p3led_kn_grp_mt76x8[] = {
        FUNC("jtag", 3, 31, 1),
        FUNC("utif", 2, 31, 1),
        FUNC("gpio", 1, 31, 1),
        FUNC("p3led_kn", 0, 31, 1),
 };
 
-static struct ralink_pmx_func p2led_kn_func_mt76x8[] = {
+static struct ralink_pmx_func p2led_kn_grp_mt76x8[] = {
        FUNC("jtag", 3, 32, 1),
        FUNC("utif", 2, 32, 1),
        FUNC("gpio", 1, 32, 1),
        FUNC("p2led_kn", 0, 32, 1),
 };
 
-static struct ralink_pmx_func p1led_kn_func_mt76x8[] = {
+static struct ralink_pmx_func p1led_kn_grp_mt76x8[] = {
        FUNC("jtag", 3, 33, 1),
        FUNC("utif", 2, 33, 1),
        FUNC("gpio", 1, 33, 1),
        FUNC("p1led_kn", 0, 33, 1),
 };
 
-static struct ralink_pmx_func p0led_kn_func_mt76x8[] = {
+static struct ralink_pmx_func p0led_kn_grp_mt76x8[] = {
        FUNC("jtag", 3, 34, 1),
        FUNC("rsvd", 2, 34, 1),
        FUNC("gpio", 1, 34, 1),
        FUNC("p0led_kn", 0, 34, 1),
 };
 
-static struct ralink_pmx_func wled_kn_func_mt76x8[] = {
+static struct ralink_pmx_func wled_kn_grp_mt76x8[] = {
        FUNC("rsvd", 3, 35, 1),
        FUNC("rsvd", 2, 35, 1),
        FUNC("gpio", 1, 35, 1),
        FUNC("wled_kn", 0, 35, 1),
 };
 
-static struct ralink_pmx_func p4led_an_func_mt76x8[] = {
+static struct ralink_pmx_func p4led_an_grp_mt76x8[] = {
        FUNC("jtag", 3, 39, 1),
        FUNC("utif", 2, 39, 1),
        FUNC("gpio", 1, 39, 1),
        FUNC("p4led_an", 0, 39, 1),
 };
 
-static struct ralink_pmx_func p3led_an_func_mt76x8[] = {
+static struct ralink_pmx_func p3led_an_grp_mt76x8[] = {
        FUNC("jtag", 3, 40, 1),
        FUNC("utif", 2, 40, 1),
        FUNC("gpio", 1, 40, 1),
        FUNC("p3led_an", 0, 40, 1),
 };
 
-static struct ralink_pmx_func p2led_an_func_mt76x8[] = {
+static struct ralink_pmx_func p2led_an_grp_mt76x8[] = {
        FUNC("jtag", 3, 41, 1),
        FUNC("utif", 2, 41, 1),
        FUNC("gpio", 1, 41, 1),
        FUNC("p2led_an", 0, 41, 1),
 };
 
-static struct ralink_pmx_func p1led_an_func_mt76x8[] = {
+static struct ralink_pmx_func p1led_an_grp_mt76x8[] = {
        FUNC("jtag", 3, 42, 1),
        FUNC("utif", 2, 42, 1),
        FUNC("gpio", 1, 42, 1),
        FUNC("p1led_an", 0, 42, 1),
 };
 
-static struct ralink_pmx_func p0led_an_func_mt76x8[] = {
+static struct ralink_pmx_func p0led_an_grp_mt76x8[] = {
        FUNC("jtag", 3, 43, 1),
        FUNC("rsvd", 2, 43, 1),
        FUNC("gpio", 1, 43, 1),
        FUNC("p0led_an", 0, 43, 1),
 };
 
-static struct ralink_pmx_func wled_an_func_mt76x8[] = {
+static struct ralink_pmx_func wled_an_grp_mt76x8[] = {
        FUNC("rsvd", 3, 44, 1),
        FUNC("rsvd", 2, 44, 1),
        FUNC("gpio", 1, 44, 1),
@@ -309,55 +309,55 @@ static struct ralink_pmx_func wled_an_func_mt76x8[] = {
 #define MT76X8_GPIO_MODE_GPIO          0
 
 static struct ralink_pmx_group mt76x8_pinmux_data[] = {
-       GRP_G("pwm1", pwm1_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("pwm1", pwm1_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_PWM1),
-       GRP_G("pwm0", pwm0_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("pwm0", pwm0_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_PWM0),
-       GRP_G("uart2", uart2_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("uart2", uart2_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_UART2),
-       GRP_G("uart1", uart1_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("uart1", uart1_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_UART1),
-       GRP_G("i2c", i2c_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("i2c", i2c_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_I2C),
-       GRP("refclk", refclk_func_mt76x8, 1, MT76X8_GPIO_MODE_REFCLK),
-       GRP("perst", perst_func_mt76x8, 1, MT76X8_GPIO_MODE_PERST),
-       GRP("wdt", wdt_func_mt76x8, 1, MT76X8_GPIO_MODE_WDT),
-       GRP("spi", spi_func_mt76x8, 1, MT76X8_GPIO_MODE_SPI),
-       GRP_G("sdmode", sd_mode_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP("refclk", refclk_grp_mt76x8, 1, MT76X8_GPIO_MODE_REFCLK),
+       GRP("perst", perst_grp_mt76x8, 1, MT76X8_GPIO_MODE_PERST),
+       GRP("wdt", wdt_grp_mt76x8, 1, MT76X8_GPIO_MODE_WDT),
+       GRP("spi", spi_grp_mt76x8, 1, MT76X8_GPIO_MODE_SPI),
+       GRP_G("sdmode", sd_mode_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_SDMODE),
-       GRP_G("uart0", uart0_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("uart0", uart0_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_UART0),
-       GRP_G("i2s", i2s_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("i2s", i2s_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_I2S),
-       GRP_G("spi cs1", spi_cs1_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("spi cs1", spi_cs1_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_CS1),
-       GRP_G("spis", spis_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("spis", spis_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_SPIS),
-       GRP_G("gpio", gpio_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("gpio", gpio_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_GPIO),
-       GRP_G("wled_an", wled_an_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("wled_an", wled_an_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_WLED_AN),
-       GRP_G("p0led_an", p0led_an_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("p0led_an", p0led_an_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_P0LED_AN),
-       GRP_G("p1led_an", p1led_an_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("p1led_an", p1led_an_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_P1LED_AN),
-       GRP_G("p2led_an", p2led_an_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("p2led_an", p2led_an_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_P2LED_AN),
-       GRP_G("p3led_an", p3led_an_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("p3led_an", p3led_an_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_P3LED_AN),
-       GRP_G("p4led_an", p4led_an_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("p4led_an", p4led_an_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_P4LED_AN),
-       GRP_G("wled_kn", wled_kn_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("wled_kn", wled_kn_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_WLED_KN),
-       GRP_G("p0led_kn", p0led_kn_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("p0led_kn", p0led_kn_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_P0LED_KN),
-       GRP_G("p1led_kn", p1led_kn_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("p1led_kn", p1led_kn_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_P1LED_KN),
-       GRP_G("p2led_kn", p2led_kn_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("p2led_kn", p2led_kn_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_P2LED_KN),
-       GRP_G("p3led_kn", p3led_kn_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("p3led_kn", p3led_kn_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_P3LED_KN),
-       GRP_G("p4led_kn", p4led_kn_func_mt76x8, MT76X8_GPIO_MODE_MASK,
+       GRP_G("p4led_kn", p4led_kn_grp_mt76x8, MT76X8_GPIO_MODE_MASK,
                                1, MT76X8_GPIO_MODE_P4LED_KN),
        { 0 }
 };

diff --git a/drivers/pinctrl/ralink/pinctrl-mt7621.c b/drivers/pinctrl/ralink/pinctrl-mt7621.c
index b47968f40e0c2a6dd15cf0214eba63867e1fa062..eddc0ba6d468c5eb2c76ff441e6a03d985510fe4 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-mt7621.c
+++ b/drivers/pinctrl/ralink/pinctrl-mt7621.c
@@ -34,59 +34,59 @@
 #define MT7621_GPIO_MODE_SDHCI_SHIFT   18
 #define MT7621_GPIO_MODE_SDHCI_GPIO    1
 
-static struct ralink_pmx_func uart1_func[] =  { FUNC("uart1", 0, 1, 2) };
-static struct ralink_pmx_func i2c_func[] =  { FUNC("i2c", 0, 3, 2) };
-static struct ralink_pmx_func uart3_func[] = {
+static struct ralink_pmx_func uart1_grp[] =  { FUNC("uart1", 0, 1, 2) };
+static struct ralink_pmx_func i2c_grp[] =  { FUNC("i2c", 0, 3, 2) };
+static struct ralink_pmx_func uart3_grp[] = {
        FUNC("uart3", 0, 5, 4),
        FUNC("i2s", 2, 5, 4),
        FUNC("spdif3", 3, 5, 4),
 };
-static struct ralink_pmx_func uart2_func[] = {
+static struct ralink_pmx_func uart2_grp[] = {
        FUNC("uart2", 0, 9, 4),
        FUNC("pcm", 2, 9, 4),
        FUNC("spdif2", 3, 9, 4),
 };
-static struct ralink_pmx_func jtag_func[] = { FUNC("jtag", 0, 13, 5) };
-static struct ralink_pmx_func wdt_func[] = {
+static struct ralink_pmx_func jtag_grp[] = { FUNC("jtag", 0, 13, 5) };
+static struct ralink_pmx_func wdt_grp[] = {
        FUNC("wdt rst", 0, 18, 1),
        FUNC("wdt refclk", 2, 18, 1),
 };
-static struct ralink_pmx_func pcie_rst_func[] = {
+static struct ralink_pmx_func pcie_rst_grp[] = {
        FUNC("pcie rst", MT7621_GPIO_MODE_PCIE_RST, 19, 1),
        FUNC("pcie refclk", MT7621_GPIO_MODE_PCIE_REF, 19, 1)
 };
-static struct ralink_pmx_func mdio_func[] = { FUNC("mdio", 0, 20, 2) };
-static struct ralink_pmx_func rgmii2_func[] = { FUNC("rgmii2", 0, 22, 12) };
-static struct ralink_pmx_func spi_func[] = {
+static struct ralink_pmx_func mdio_grp[] = { FUNC("mdio", 0, 20, 2) };
+static struct ralink_pmx_func rgmii2_grp[] = { FUNC("rgmii2", 0, 22, 12) };
+static struct ralink_pmx_func spi_grp[] = {
        FUNC("spi", 0, 34, 7),
        FUNC("nand1", 2, 34, 7),
 };
-static struct ralink_pmx_func sdhci_func[] = {
+static struct ralink_pmx_func sdhci_grp[] = {
        FUNC("sdhci", 0, 41, 8),
        FUNC("nand2", 2, 41, 8),
 };
-static struct ralink_pmx_func rgmii1_func[] = { FUNC("rgmii1", 0, 49, 12) };
+static struct ralink_pmx_func rgmii1_grp[] = { FUNC("rgmii1", 0, 49, 12) };
 
 static struct ralink_pmx_group mt7621_pinmux_data[] = {
-       GRP("uart1", uart1_func, 1, MT7621_GPIO_MODE_UART1),
-       GRP("i2c", i2c_func, 1, MT7621_GPIO_MODE_I2C),
-       GRP_G("uart3", uart3_func, MT7621_GPIO_MODE_UART3_MASK,
+       GRP("uart1", uart1_grp, 1, MT7621_GPIO_MODE_UART1),
+       GRP("i2c", i2c_grp, 1, MT7621_GPIO_MODE_I2C),
+       GRP_G("uart3", uart3_grp, MT7621_GPIO_MODE_UART3_MASK,
                MT7621_GPIO_MODE_UART3_GPIO, MT7621_GPIO_MODE_UART3_SHIFT),
-       GRP_G("uart2", uart2_func, MT7621_GPIO_MODE_UART2_MASK,
+       GRP_G("uart2", uart2_grp, MT7621_GPIO_MODE_UART2_MASK,
                MT7621_GPIO_MODE_UART2_GPIO, MT7621_GPIO_MODE_UART2_SHIFT),
-       GRP("jtag", jtag_func, 1, MT7621_GPIO_MODE_JTAG),
-       GRP_G("wdt", wdt_func, MT7621_GPIO_MODE_WDT_MASK,
+       GRP("jtag", jtag_grp, 1, MT7621_GPIO_MODE_JTAG),
+       GRP_G("wdt", wdt_grp, MT7621_GPIO_MODE_WDT_MASK,
                MT7621_GPIO_MODE_WDT_GPIO, MT7621_GPIO_MODE_WDT_SHIFT),
-       GRP_G("pcie", pcie_rst_func, MT7621_GPIO_MODE_PCIE_MASK,
+       GRP_G("pcie", pcie_rst_grp, MT7621_GPIO_MODE_PCIE_MASK,
                MT7621_GPIO_MODE_PCIE_GPIO, MT7621_GPIO_MODE_PCIE_SHIFT),
-       GRP_G("mdio", mdio_func, MT7621_GPIO_MODE_MDIO_MASK,
+       GRP_G("mdio", mdio_grp, MT7621_GPIO_MODE_MDIO_MASK,
                MT7621_GPIO_MODE_MDIO_GPIO, MT7621_GPIO_MODE_MDIO_SHIFT),
-       GRP("rgmii2", rgmii2_func, 1, MT7621_GPIO_MODE_RGMII2),
-       GRP_G("spi", spi_func, MT7621_GPIO_MODE_SPI_MASK,
+       GRP("rgmii2", rgmii2_grp, 1, MT7621_GPIO_MODE_RGMII2),
+       GRP_G("spi", spi_grp, MT7621_GPIO_MODE_SPI_MASK,
                MT7621_GPIO_MODE_SPI_GPIO, MT7621_GPIO_MODE_SPI_SHIFT),
-       GRP_G("sdhci", sdhci_func, MT7621_GPIO_MODE_SDHCI_MASK,
+       GRP_G("sdhci", sdhci_grp, MT7621_GPIO_MODE_SDHCI_MASK,
                MT7621_GPIO_MODE_SDHCI_GPIO, MT7621_GPIO_MODE_SDHCI_SHIFT),
-       GRP("rgmii1", rgmii1_func, 1, MT7621_GPIO_MODE_RGMII1),
+       GRP("rgmii1", rgmii1_grp, 1, MT7621_GPIO_MODE_RGMII1),
        { 0 }
 };
 

diff --git a/drivers/pinctrl/ralink/pinctrl-rt2880.c b/drivers/pinctrl/ralink/pinctrl-rt2880.c
index 811e12df113317751d40a9d7c9226d8ccdc5a986..3e2f1aaaf0957d1ae56749addfb2732f45c14026 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-rt2880.c
+++ b/drivers/pinctrl/ralink/pinctrl-rt2880.c
@@ -15,22 +15,22 @@
 #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_func i2c_grp[] = { FUNC("i2c", 0, 1, 2) };
+static struct ralink_pmx_func spi_grp[] = { FUNC("spi", 0, 3, 4) };
+static struct ralink_pmx_func uartlite_grp[] = { FUNC("uartlite", 0, 7, 8) };
+static struct ralink_pmx_func jtag_grp[] = { FUNC("jtag", 0, 17, 5) };
+static struct ralink_pmx_func mdio_grp[] = { FUNC("mdio", 0, 22, 2) };
+static struct ralink_pmx_func sdram_grp[] = { FUNC("sdram", 0, 24, 16) };
+static struct ralink_pmx_func pci_grp[] = { 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),
+       GRP("i2c", i2c_grp, 1, RT2880_GPIO_MODE_I2C),
+       GRP("spi", spi_grp, 1, RT2880_GPIO_MODE_SPI),
+       GRP("uartlite", uartlite_grp, 1, RT2880_GPIO_MODE_UART0),
+       GRP("jtag", jtag_grp, 1, RT2880_GPIO_MODE_JTAG),
+       GRP("mdio", mdio_grp, 1, RT2880_GPIO_MODE_MDIO),
+       GRP("sdram", sdram_grp, 1, RT2880_GPIO_MODE_SDRAM),
+       GRP("pci", pci_grp, 1, RT2880_GPIO_MODE_PCI),
        { 0 }
 };
 

diff --git a/drivers/pinctrl/ralink/pinctrl-rt305x.c b/drivers/pinctrl/ralink/pinctrl-rt305x.c
index 5b204b7ca1f3c6e119125f978e15363afd4df3a5..bdaee5ce1ee088575c3ab17383e4c2a6ced0f230 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-rt305x.c
+++ b/drivers/pinctrl/ralink/pinctrl-rt305x.c
@@ -31,9 +31,9 @@
 #define RT3352_GPIO_MODE_LNA           18
 #define RT3352_GPIO_MODE_PA            20
 
-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 uartf_func[] = {
+static struct ralink_pmx_func i2c_grp[] =  { FUNC("i2c", 0, 1, 2) };
+static struct ralink_pmx_func spi_grp[] = { FUNC("spi", 0, 3, 4) };
+static struct ralink_pmx_func uartf_grp[] = {
        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),
@@ -42,65 +42,65 @@ static struct ralink_pmx_func uartf_func[] = {
        FUNC("gpio uartf", RT305X_GPIO_MODE_GPIO_UARTF, 7, 4),
        FUNC("gpio i2s", RT305X_GPIO_MODE_GPIO_I2S, 7, 4),
 };
-static struct ralink_pmx_func uartlite_func[] = { FUNC("uartlite", 0, 15, 2) };
-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 rt5350_led_func[] = { FUNC("led", 0, 22, 5) };
-static struct ralink_pmx_func rt5350_cs1_func[] = {
+static struct ralink_pmx_func uartlite_grp[] = { FUNC("uartlite", 0, 15, 2) };
+static struct ralink_pmx_func jtag_grp[] = { FUNC("jtag", 0, 17, 5) };
+static struct ralink_pmx_func mdio_grp[] = { FUNC("mdio", 0, 22, 2) };
+static struct ralink_pmx_func rt5350_led_grp[] = { FUNC("led", 0, 22, 5) };
+static struct ralink_pmx_func rt5350_cs1_grp[] = {
        FUNC("spi_cs1", 0, 27, 1),
        FUNC("wdg_cs1", 1, 27, 1),
 };
-static struct ralink_pmx_func sdram_func[] = { FUNC("sdram", 0, 24, 16) };
-static struct ralink_pmx_func rt3352_rgmii_func[] = {
+static struct ralink_pmx_func sdram_grp[] = { FUNC("sdram", 0, 24, 16) };
+static struct ralink_pmx_func rt3352_rgmii_grp[] = {
        FUNC("rgmii", 0, 24, 12)
 };
-static struct ralink_pmx_func rgmii_func[] = { FUNC("rgmii", 0, 40, 12) };
-static struct ralink_pmx_func rt3352_lna_func[] = { FUNC("lna", 0, 36, 2) };
-static struct ralink_pmx_func rt3352_pa_func[] = { FUNC("pa", 0, 38, 2) };
-static struct ralink_pmx_func rt3352_led_func[] = { FUNC("led", 0, 40, 5) };
-static struct ralink_pmx_func rt3352_cs1_func[] = {
+static struct ralink_pmx_func rgmii_grp[] = { FUNC("rgmii", 0, 40, 12) };
+static struct ralink_pmx_func rt3352_lna_grp[] = { FUNC("lna", 0, 36, 2) };
+static struct ralink_pmx_func rt3352_pa_grp[] = { FUNC("pa", 0, 38, 2) };
+static struct ralink_pmx_func rt3352_led_grp[] = { FUNC("led", 0, 40, 5) };
+static struct ralink_pmx_func rt3352_cs1_grp[] = {
        FUNC("spi_cs1", 0, 45, 1),
        FUNC("wdg_cs1", 1, 45, 1),
 };
 
 static struct ralink_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,
+       GRP("i2c", i2c_grp, 1, RT305X_GPIO_MODE_I2C),
+       GRP("spi", spi_grp, 1, RT305X_GPIO_MODE_SPI),
+       GRP("uartf", uartf_grp, 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),
+       GRP("uartlite", uartlite_grp, 1, RT305X_GPIO_MODE_UART1),
+       GRP("jtag", jtag_grp, 1, RT305X_GPIO_MODE_JTAG),
+       GRP("mdio", mdio_grp, 1, RT305X_GPIO_MODE_MDIO),
+       GRP("rgmii", rgmii_grp, 1, RT305X_GPIO_MODE_RGMII),
+       GRP("sdram", sdram_grp, 1, RT305X_GPIO_MODE_SDRAM),
        { 0 }
 };
 
 static struct ralink_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,
+       GRP("i2c", i2c_grp, 1, RT305X_GPIO_MODE_I2C),
+       GRP("spi", spi_grp, 1, RT305X_GPIO_MODE_SPI),
+       GRP("uartf", uartf_grp, 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),
+       GRP("uartlite", uartlite_grp, 1, RT305X_GPIO_MODE_UART1),
+       GRP("jtag", jtag_grp, 1, RT305X_GPIO_MODE_JTAG),
+       GRP("mdio", mdio_grp, 1, RT305X_GPIO_MODE_MDIO),
+       GRP("rgmii", rt3352_rgmii_grp, 1, RT305X_GPIO_MODE_RGMII),
+       GRP("lna", rt3352_lna_grp, 1, RT3352_GPIO_MODE_LNA),
+       GRP("pa", rt3352_pa_grp, 1, RT3352_GPIO_MODE_PA),
+       GRP("led", rt3352_led_grp, 1, RT5350_GPIO_MODE_PHY_LED),
+       GRP("spi_cs1", rt3352_cs1_grp, 2, RT5350_GPIO_MODE_SPI_CS1),
        { 0 }
 };
 
 static struct ralink_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,
+       GRP("i2c", i2c_grp, 1, RT305X_GPIO_MODE_I2C),
+       GRP("spi", spi_grp, 1, RT305X_GPIO_MODE_SPI),
+       GRP("uartf", uartf_grp, 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),
+       GRP("uartlite", uartlite_grp, 1, RT305X_GPIO_MODE_UART1),
+       GRP("jtag", jtag_grp, 1, RT305X_GPIO_MODE_JTAG),
+       GRP("led", rt5350_led_grp, 1, RT5350_GPIO_MODE_PHY_LED),
+       GRP("spi_cs1", rt5350_cs1_grp, 2, RT5350_GPIO_MODE_SPI_CS1),
        { 0 }
 };
 

diff --git a/drivers/pinctrl/ralink/pinctrl-rt3883.c b/drivers/pinctrl/ralink/pinctrl-rt3883.c
index 44a66c3d2d2a1138a8e3b53bc76a6cd0c30c7882..392208662355d012250a9bf29bd5e15fbdb5556f 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-rt3883.c
+++ b/drivers/pinctrl/ralink/pinctrl-rt3883.c
@@ -39,9 +39,9 @@
 #define RT3883_GPIO_MODE_LNA_G_GPIO    0x3
 #define RT3883_GPIO_MODE_LNA_G         _RT3883_GPIO_MODE_LNA_G(RT3883_GPIO_MODE_LNA_G_MASK)
 
-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 uartf_func[] = {
+static struct ralink_pmx_func i2c_grp[] =  { FUNC("i2c", 0, 1, 2) };
+static struct ralink_pmx_func spi_grp[] = { FUNC("spi", 0, 3, 4) };
+static struct ralink_pmx_func uartf_grp[] = {
        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),
@@ -50,34 +50,34 @@ static struct ralink_pmx_func uartf_func[] = {
        FUNC("gpio uartf", RT3883_GPIO_MODE_GPIO_UARTF, 7, 4),
        FUNC("gpio i2s", RT3883_GPIO_MODE_GPIO_I2S, 7, 4),
 };
-static struct ralink_pmx_func uartlite_func[] = { FUNC("uartlite", 0, 15, 2) };
-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 lna_a_func[] = { FUNC("lna a", 0, 32, 3) };
-static struct ralink_pmx_func lna_g_func[] = { FUNC("lna g", 0, 35, 3) };
-static struct ralink_pmx_func pci_func[] = {
+static struct ralink_pmx_func uartlite_grp[] = { FUNC("uartlite", 0, 15, 2) };
+static struct ralink_pmx_func jtag_grp[] = { FUNC("jtag", 0, 17, 5) };
+static struct ralink_pmx_func mdio_grp[] = { FUNC("mdio", 0, 22, 2) };
+static struct ralink_pmx_func lna_a_grp[] = { FUNC("lna a", 0, 32, 3) };
+static struct ralink_pmx_func lna_g_grp[] = { FUNC("lna g", 0, 35, 3) };
+static struct ralink_pmx_func pci_grp[] = {
        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 ralink_pmx_func ge1_func[] = { FUNC("ge1", 0, 72, 12) };
-static struct ralink_pmx_func ge2_func[] = { FUNC("ge2", 0, 84, 12) };
+static struct ralink_pmx_func ge1_grp[] = { FUNC("ge1", 0, 72, 12) };
+static struct ralink_pmx_func ge2_grp[] = { FUNC("ge2", 0, 84, 12) };
 
 static struct ralink_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,
+       GRP("i2c", i2c_grp, 1, RT3883_GPIO_MODE_I2C),
+       GRP("spi", spi_grp, 1, RT3883_GPIO_MODE_SPI),
+       GRP("uartf", uartf_grp, 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,
+       GRP("uartlite", uartlite_grp, 1, RT3883_GPIO_MODE_UART1),
+       GRP("jtag", jtag_grp, 1, RT3883_GPIO_MODE_JTAG),
+       GRP("mdio", mdio_grp, 1, RT3883_GPIO_MODE_MDIO),
+       GRP("lna a", lna_a_grp, 1, RT3883_GPIO_MODE_LNA_A),
+       GRP("lna g", lna_g_grp, 1, RT3883_GPIO_MODE_LNA_G),
+       GRP("pci", pci_grp, 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),
+       GRP("ge1", ge1_grp, 1, RT3883_GPIO_MODE_GE1),
+       GRP("ge2", ge2_grp, 1, RT3883_GPIO_MODE_GE2),
        { 0 }
 };