pinctrl: ralink: add new compatible strings for each pinctrl subdriver

As seen on any other pinctrl subdriver that calls code from a main driver,
each subdriver needs to have a different compatible string. We don't want
the same compatible string to match a different subdriver's pinmux data as
it's not for our SoC.

Therefore, add new compatible strings for each pinctrl subdriver. Change
driver name on all subdrivers accordingly.

Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
Acked-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Link: https://lore.kernel.org/r/20220414173916.5552-8-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 fde269c68a7bf1b85fab783494a87e3776642b91..22ff16eff02ff92ab58f6dffed134e68f646f55a 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-mt7620.c
+++ b/drivers/pinctrl/ralink/pinctrl-mt7620.c
@@ -371,7 +371,7 @@ static int mt7620_pinctrl_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id mt7620_pinctrl_match[] = {
-       { .compatible = "ralink,rt2880-pinmux" },
+       { .compatible = "ralink,mt7620-pinctrl" },
        {}
 };
 MODULE_DEVICE_TABLE(of, mt7620_pinctrl_match);
@@ -379,7 +379,7 @@ MODULE_DEVICE_TABLE(of, mt7620_pinctrl_match);
 static struct platform_driver mt7620_pinctrl_driver = {
        .probe = mt7620_pinctrl_probe,
        .driver = {
-               .name = "rt2880-pinmux",
+               .name = "mt7620-pinctrl",
                .of_match_table = mt7620_pinctrl_match,
        },
 };

diff --git a/drivers/pinctrl/ralink/pinctrl-mt7621.c b/drivers/pinctrl/ralink/pinctrl-mt7621.c
index 1470250ca3b7d2bdf15d9ce23e6cbbed3f5b918f..b47968f40e0c2a6dd15cf0214eba63867e1fa062 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-mt7621.c
+++ b/drivers/pinctrl/ralink/pinctrl-mt7621.c
@@ -96,7 +96,7 @@ static int mt7621_pinctrl_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id mt7621_pinctrl_match[] = {
-       { .compatible = "ralink,rt2880-pinmux" },
+       { .compatible = "ralink,mt7621-pinctrl" },
        {}
 };
 MODULE_DEVICE_TABLE(of, mt7621_pinctrl_match);
@@ -104,7 +104,7 @@ MODULE_DEVICE_TABLE(of, mt7621_pinctrl_match);
 static struct platform_driver mt7621_pinctrl_driver = {
        .probe = mt7621_pinctrl_probe,
        .driver = {
-               .name = "rt2880-pinmux",
+               .name = "mt7621-pinctrl",
                .of_match_table = mt7621_pinctrl_match,
        },
 };

diff --git a/drivers/pinctrl/ralink/pinctrl-rt2880.c b/drivers/pinctrl/ralink/pinctrl-rt2880.c
index 9c5e828af43aea48702eda1b5d3e59c2b7cd4d97..811e12df113317751d40a9d7c9226d8ccdc5a986 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-rt2880.c
+++ b/drivers/pinctrl/ralink/pinctrl-rt2880.c
@@ -40,7 +40,7 @@ static int rt2880_pinctrl_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id rt2880_pinctrl_match[] = {
-       { .compatible = "ralink,rt2880-pinmux" },
+       { .compatible = "ralink,rt2880-pinctrl" },
        {}
 };
 MODULE_DEVICE_TABLE(of, rt2880_pinctrl_match);
@@ -48,7 +48,7 @@ MODULE_DEVICE_TABLE(of, rt2880_pinctrl_match);
 static struct platform_driver rt2880_pinctrl_driver = {
        .probe = rt2880_pinctrl_probe,
        .driver = {
-               .name = "rt2880-pinmux",
+               .name = "rt2880-pinctrl",
                .of_match_table = rt2880_pinctrl_match,
        },
 };

diff --git a/drivers/pinctrl/ralink/pinctrl-rt305x.c b/drivers/pinctrl/ralink/pinctrl-rt305x.c
index b4765ca27cacfb3ff872053a0e5d9b3fad9de09b..5b204b7ca1f3c6e119125f978e15363afd4df3a5 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-rt305x.c
+++ b/drivers/pinctrl/ralink/pinctrl-rt305x.c
@@ -117,7 +117,7 @@ static int rt305x_pinctrl_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id rt305x_pinctrl_match[] = {
-       { .compatible = "ralink,rt2880-pinmux" },
+       { .compatible = "ralink,rt305x-pinctrl" },
        {}
 };
 MODULE_DEVICE_TABLE(of, rt305x_pinctrl_match);
@@ -125,7 +125,7 @@ MODULE_DEVICE_TABLE(of, rt305x_pinctrl_match);
 static struct platform_driver rt305x_pinctrl_driver = {
        .probe = rt305x_pinctrl_probe,
        .driver = {
-               .name = "rt2880-pinmux",
+               .name = "rt305x-pinctrl",
                .of_match_table = rt305x_pinctrl_match,
        },
 };

diff --git a/drivers/pinctrl/ralink/pinctrl-rt3883.c b/drivers/pinctrl/ralink/pinctrl-rt3883.c
index b2e8151de2261195886175ff67d71e621d5a1c50..44a66c3d2d2a1138a8e3b53bc76a6cd0c30c7882 100644 (file)
--- a/drivers/pinctrl/ralink/pinctrl-rt3883.c
+++ b/drivers/pinctrl/ralink/pinctrl-rt3883.c
@@ -87,7 +87,7 @@ static int rt3883_pinctrl_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id rt3883_pinctrl_match[] = {
-       { .compatible = "ralink,rt2880-pinmux" },
+       { .compatible = "ralink,rt3883-pinctrl" },
        {}
 };
 MODULE_DEVICE_TABLE(of, rt3883_pinctrl_match);
@@ -95,7 +95,7 @@ MODULE_DEVICE_TABLE(of, rt3883_pinctrl_match);
 static struct platform_driver rt3883_pinctrl_driver = {
        .probe = rt3883_pinctrl_probe,
        .driver = {
-               .name = "rt2880-pinmux",
+               .name = "rt3883-pinctrl",
                .of_match_table = rt3883_pinctrl_match,
        },
 };