pinctrl: ralink: rename pinmux functions to pinctrl

Rename pinctrl related functions from "pinmux" to "pinctrl". Change driver
name from "ralink-pinmux" to "ralink-pinctrl".

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-4-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 51b863d..a790f39 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-mt7620.c
+++ b/drivers/pinctrl/ralink/pinctrl-mt7620.c
@@ -362,30 +362,30 @@ static struct ralink_pmx_group mt76x8_pinmux_data[] = {
        { 0 }
 };
 
-static int mt7620_pinmux_probe(struct platform_device *pdev)
+static int mt7620_pinctrl_probe(struct platform_device *pdev)
 {
        if (is_mt76x8())
-               return ralink_pinmux_init(pdev, mt76x8_pinmux_data);
+               return ralink_pinctrl_init(pdev, mt76x8_pinmux_data);
        else
-               return ralink_pinmux_init(pdev, mt7620a_pinmux_data);
+               return ralink_pinctrl_init(pdev, mt7620a_pinmux_data);
 }
 
-static const struct of_device_id mt7620_pinmux_match[] = {
+static const struct of_device_id mt7620_pinctrl_match[] = {
        { .compatible = "ralink,rt2880-pinmux" },
        {}
 };
-MODULE_DEVICE_TABLE(of, mt7620_pinmux_match);
+MODULE_DEVICE_TABLE(of, mt7620_pinctrl_match);
 
-static struct platform_driver mt7620_pinmux_driver = {
-       .probe = mt7620_pinmux_probe,
+static struct platform_driver mt7620_pinctrl_driver = {
+       .probe = mt7620_pinctrl_probe,
        .driver = {
                .name = "rt2880-pinmux",
-               .of_match_table = mt7620_pinmux_match,
+               .of_match_table = mt7620_pinctrl_match,
        },
 };
 
-static int __init mt7620_pinmux_init(void)
+static int __init mt7620_pinctrl_init(void)
 {
-       return platform_driver_register(&mt7620_pinmux_driver);
+       return platform_driver_register(&mt7620_pinctrl_driver);
 }
-core_initcall_sync(mt7620_pinmux_init);
+core_initcall_sync(mt7620_pinctrl_init);

diff --git a/drivers/pinctrl/ralink/pinctrl-mt7621.c b/drivers/pinctrl/ralink/pinctrl-mt7621.c
index 14b89cb..bad4f1a 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-mt7621.c
+++ b/drivers/pinctrl/ralink/pinctrl-mt7621.c
@@ -90,27 +90,27 @@ static struct ralink_pmx_group mt7621_pinmux_data[] = {
        { 0 }
 };
 
-static int mt7621_pinmux_probe(struct platform_device *pdev)
+static int mt7621_pinctrl_probe(struct platform_device *pdev)
 {
-       return ralink_pinmux_init(pdev, mt7621_pinmux_data);
+       return ralink_pinctrl_init(pdev, mt7621_pinmux_data);
 }
 
-static const struct of_device_id mt7621_pinmux_match[] = {
+static const struct of_device_id mt7621_pinctrl_match[] = {
        { .compatible = "ralink,rt2880-pinmux" },
        {}
 };
-MODULE_DEVICE_TABLE(of, mt7621_pinmux_match);
+MODULE_DEVICE_TABLE(of, mt7621_pinctrl_match);
 
-static struct platform_driver mt7621_pinmux_driver = {
-       .probe = mt7621_pinmux_probe,
+static struct platform_driver mt7621_pinctrl_driver = {
+       .probe = mt7621_pinctrl_probe,
        .driver = {
                .name = "rt2880-pinmux",
-               .of_match_table = mt7621_pinmux_match,
+               .of_match_table = mt7621_pinctrl_match,
        },
 };
 
-static int __init mt7621_pinmux_init(void)
+static int __init mt7621_pinctrl_init(void)
 {
-       return platform_driver_register(&mt7621_pinmux_driver);
+       return platform_driver_register(&mt7621_pinctrl_driver);
 }
-core_initcall_sync(mt7621_pinmux_init);
+core_initcall_sync(mt7621_pinctrl_init);

diff --git a/drivers/pinctrl/ralink/pinctrl-ralink.c b/drivers/pinctrl/ralink/pinctrl-ralink.c
index 841f23f..63429a2 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-ralink.c
+++ b/drivers/pinctrl/ralink/pinctrl-ralink.c
@@ -182,7 +182,7 @@ static const struct pinmux_ops ralink_pmx_group_ops = {
 
 static struct pinctrl_desc ralink_pctrl_desc = {
        .owner          = THIS_MODULE,
-       .name           = "ralink-pinmux",
+       .name           = "ralink-pinctrl",
        .pctlops        = &ralink_pctrl_ops,
        .pmxops         = &ralink_pmx_group_ops,
 };
@@ -191,7 +191,7 @@ static struct ralink_pmx_func gpio_func = {
        .name = "gpio",
 };
 
-static int ralink_pinmux_index(struct ralink_priv *p)
+static int ralink_pinctrl_index(struct ralink_priv *p)
 {
        struct ralink_pmx_group *mux = p->groups;
        int i, j, c = 0;
@@ -248,7 +248,7 @@ static int ralink_pinmux_index(struct ralink_priv *p)
        return 0;
 }
 
-static int ralink_pinmux_pins(struct ralink_priv *p)
+static int ralink_pinctrl_pins(struct ralink_priv *p)
 {
        int i, j;
 
@@ -311,8 +311,8 @@ static int ralink_pinmux_pins(struct ralink_priv *p)
        return 0;
 }
 
-int ralink_pinmux_init(struct platform_device *pdev,
-                      struct ralink_pmx_group *data)
+int ralink_pinctrl_init(struct platform_device *pdev,
+                       struct ralink_pmx_group *data)
 {
        struct ralink_priv *p;
        struct pinctrl_dev *dev;
@@ -332,13 +332,13 @@ int ralink_pinmux_init(struct platform_device *pdev,
        platform_set_drvdata(pdev, p);
 
        /* init the device */
-       err = ralink_pinmux_index(p);
+       err = ralink_pinctrl_index(p);
        if (err) {
                dev_err(&pdev->dev, "failed to load index\n");
                return err;
        }
 
-       err = ralink_pinmux_pins(p);
+       err = ralink_pinctrl_pins(p);
        if (err) {
                dev_err(&pdev->dev, "failed to load pins\n");
                return err;

diff --git a/drivers/pinctrl/ralink/pinctrl-ralink.h b/drivers/pinctrl/ralink/pinctrl-ralink.h
index 1349694..e6037be 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-ralink.h
+++ b/drivers/pinctrl/ralink/pinctrl-ralink.h
@@ -47,7 +47,7 @@ struct ralink_pmx_group {
        int func_count;
 };
 
-int ralink_pinmux_init(struct platform_device *pdev,
-                      struct ralink_pmx_group *data);
+int ralink_pinctrl_init(struct platform_device *pdev,
+                       struct ralink_pmx_group *data);
 
 #endif

diff --git a/drivers/pinctrl/ralink/pinctrl-rt288x.c b/drivers/pinctrl/ralink/pinctrl-rt288x.c
index 40c4514..db5c09e 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-rt288x.c
+++ b/drivers/pinctrl/ralink/pinctrl-rt288x.c
@@ -34,27 +34,27 @@ static struct ralink_pmx_group rt2880_pinmux_data_act[] = {
        { 0 }
 };
 
-static int rt288x_pinmux_probe(struct platform_device *pdev)
+static int rt288x_pinctrl_probe(struct platform_device *pdev)
 {
-       return ralink_pinmux_init(pdev, rt2880_pinmux_data_act);
+       return ralink_pinctrl_init(pdev, rt2880_pinmux_data_act);
 }
 
-static const struct of_device_id rt288x_pinmux_match[] = {
+static const struct of_device_id rt288x_pinctrl_match[] = {
        { .compatible = "ralink,rt2880-pinmux" },
        {}
 };
-MODULE_DEVICE_TABLE(of, rt288x_pinmux_match);
+MODULE_DEVICE_TABLE(of, rt288x_pinctrl_match);
 
-static struct platform_driver rt288x_pinmux_driver = {
-       .probe = rt288x_pinmux_probe,
+static struct platform_driver rt288x_pinctrl_driver = {
+       .probe = rt288x_pinctrl_probe,
        .driver = {
                .name = "rt2880-pinmux",
-               .of_match_table = rt288x_pinmux_match,
+               .of_match_table = rt288x_pinctrl_match,
        },
 };
 
-static int __init rt288x_pinmux_init(void)
+static int __init rt288x_pinctrl_init(void)
 {
-       return platform_driver_register(&rt288x_pinmux_driver);
+       return platform_driver_register(&rt288x_pinctrl_driver);
 }
-core_initcall_sync(rt288x_pinmux_init);
+core_initcall_sync(rt288x_pinctrl_init);

diff --git a/drivers/pinctrl/ralink/pinctrl-rt305x.c b/drivers/pinctrl/ralink/pinctrl-rt305x.c
index 25527ca..b4765ca 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-rt305x.c
+++ b/drivers/pinctrl/ralink/pinctrl-rt305x.c
@@ -104,34 +104,34 @@ static struct ralink_pmx_group rt5350_pinmux_data[] = {
        { 0 }
 };
 
-static int rt305x_pinmux_probe(struct platform_device *pdev)
+static int rt305x_pinctrl_probe(struct platform_device *pdev)
 {
        if (soc_is_rt5350())
-               return ralink_pinmux_init(pdev, rt5350_pinmux_data);
+               return ralink_pinctrl_init(pdev, rt5350_pinmux_data);
        else if (soc_is_rt305x() || soc_is_rt3350())
-               return ralink_pinmux_init(pdev, rt3050_pinmux_data);
+               return ralink_pinctrl_init(pdev, rt3050_pinmux_data);
        else if (soc_is_rt3352())
-               return ralink_pinmux_init(pdev, rt3352_pinmux_data);
+               return ralink_pinctrl_init(pdev, rt3352_pinmux_data);
        else
                return -EINVAL;
 }
 
-static const struct of_device_id rt305x_pinmux_match[] = {
+static const struct of_device_id rt305x_pinctrl_match[] = {
        { .compatible = "ralink,rt2880-pinmux" },
        {}
 };
-MODULE_DEVICE_TABLE(of, rt305x_pinmux_match);
+MODULE_DEVICE_TABLE(of, rt305x_pinctrl_match);
 
-static struct platform_driver rt305x_pinmux_driver = {
-       .probe = rt305x_pinmux_probe,
+static struct platform_driver rt305x_pinctrl_driver = {
+       .probe = rt305x_pinctrl_probe,
        .driver = {
                .name = "rt2880-pinmux",
-               .of_match_table = rt305x_pinmux_match,
+               .of_match_table = rt305x_pinctrl_match,
        },
 };
 
-static int __init rt305x_pinmux_init(void)
+static int __init rt305x_pinctrl_init(void)
 {
-       return platform_driver_register(&rt305x_pinmux_driver);
+       return platform_driver_register(&rt305x_pinctrl_driver);
 }
-core_initcall_sync(rt305x_pinmux_init);
+core_initcall_sync(rt305x_pinctrl_init);

diff --git a/drivers/pinctrl/ralink/pinctrl-rt3883.c b/drivers/pinctrl/ralink/pinctrl-rt3883.c
index 0b8674d..b2e8151 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-rt3883.c
+++ b/drivers/pinctrl/ralink/pinctrl-rt3883.c
@@ -81,27 +81,27 @@ static struct ralink_pmx_group rt3883_pinmux_data[] = {
        { 0 }
 };
 
-static int rt3883_pinmux_probe(struct platform_device *pdev)
+static int rt3883_pinctrl_probe(struct platform_device *pdev)
 {
-       return ralink_pinmux_init(pdev, rt3883_pinmux_data);
+       return ralink_pinctrl_init(pdev, rt3883_pinmux_data);
 }
 
-static const struct of_device_id rt3883_pinmux_match[] = {
+static const struct of_device_id rt3883_pinctrl_match[] = {
        { .compatible = "ralink,rt2880-pinmux" },
        {}
 };
-MODULE_DEVICE_TABLE(of, rt3883_pinmux_match);
+MODULE_DEVICE_TABLE(of, rt3883_pinctrl_match);
 
-static struct platform_driver rt3883_pinmux_driver = {
-       .probe = rt3883_pinmux_probe,
+static struct platform_driver rt3883_pinctrl_driver = {
+       .probe = rt3883_pinctrl_probe,
        .driver = {
                .name = "rt2880-pinmux",
-               .of_match_table = rt3883_pinmux_match,
+               .of_match_table = rt3883_pinctrl_match,
        },
 };
 
-static int __init rt3883_pinmux_init(void)
+static int __init rt3883_pinctrl_init(void)
 {
-       return platform_driver_register(&rt3883_pinmux_driver);
+       return platform_driver_register(&rt3883_pinctrl_driver);
 }
-core_initcall_sync(rt3883_pinmux_init);
+core_initcall_sync(rt3883_pinctrl_init);