iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Arınç ÜNAL 2022-04-14 20:39:09 +03:00 committed by Linus Walleij
parent 91da26dcf5
commit e5981cd461
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pinctrl/ralink/pinctrl-mt7620.c
View File

@ -371,7 +371,7 @@ static int mt7620_pinctrl_probe(struct platform_device *pdev)
} }
static const struct of_device_id mt7620_pinctrl_match[] = { static const struct of_device_id mt7620_pinctrl_match[] = {
{ .compatible = "ralink,rt2880-pinmux" }, { .compatible = "ralink,mt7620-pinctrl" },
{} {}
}; };
MODULE_DEVICE_TABLE(of, mt7620_pinctrl_match); 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 = { static struct platform_driver mt7620_pinctrl_driver = {
.probe = mt7620_pinctrl_probe, .probe = mt7620_pinctrl_probe,
.driver = { .driver = {
.name = "rt2880-pinmux", .name = "mt7620-pinctrl",
.of_match_table = mt7620_pinctrl_match, .of_match_table = mt7620_pinctrl_match,
}, },
}; };

4
drivers/pinctrl/ralink/pinctrl-mt7621.c
View File

@ -96,7 +96,7 @@ static int mt7621_pinctrl_probe(struct platform_device *pdev)
} }
static const struct of_device_id mt7621_pinctrl_match[] = { static const struct of_device_id mt7621_pinctrl_match[] = {
{ .compatible = "ralink,rt2880-pinmux" }, { .compatible = "ralink,mt7621-pinctrl" },
{} {}
}; };
MODULE_DEVICE_TABLE(of, mt7621_pinctrl_match); 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 = { static struct platform_driver mt7621_pinctrl_driver = {
.probe = mt7621_pinctrl_probe, .probe = mt7621_pinctrl_probe,
.driver = { .driver = {
.name = "rt2880-pinmux", .name = "mt7621-pinctrl",
.of_match_table = mt7621_pinctrl_match, .of_match_table = mt7621_pinctrl_match,
}, },
}; };

4
drivers/pinctrl/ralink/pinctrl-rt2880.c
View File

@ -40,7 +40,7 @@ static int rt2880_pinctrl_probe(struct platform_device *pdev)
} }
static const struct of_device_id rt2880_pinctrl_match[] = { static const struct of_device_id rt2880_pinctrl_match[] = {
{ .compatible = "ralink,rt2880-pinmux" }, { .compatible = "ralink,rt2880-pinctrl" },
{} {}
}; };
MODULE_DEVICE_TABLE(of, rt2880_pinctrl_match); 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 = { static struct platform_driver rt2880_pinctrl_driver = {
.probe = rt2880_pinctrl_probe, .probe = rt2880_pinctrl_probe,
.driver = { .driver = {
.name = "rt2880-pinmux", .name = "rt2880-pinctrl",
.of_match_table = rt2880_pinctrl_match, .of_match_table = rt2880_pinctrl_match,
}, },
}; };

4
drivers/pinctrl/ralink/pinctrl-rt305x.c
View File

@ -117,7 +117,7 @@ static int rt305x_pinctrl_probe(struct platform_device *pdev)
} }
static const struct of_device_id rt305x_pinctrl_match[] = { static const struct of_device_id rt305x_pinctrl_match[] = {
{ .compatible = "ralink,rt2880-pinmux" }, { .compatible = "ralink,rt305x-pinctrl" },
{} {}
}; };
MODULE_DEVICE_TABLE(of, rt305x_pinctrl_match); 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 = { static struct platform_driver rt305x_pinctrl_driver = {
.probe = rt305x_pinctrl_probe, .probe = rt305x_pinctrl_probe,
.driver = { .driver = {
.name = "rt2880-pinmux", .name = "rt305x-pinctrl",
.of_match_table = rt305x_pinctrl_match, .of_match_table = rt305x_pinctrl_match,
}, },
}; };

4
drivers/pinctrl/ralink/pinctrl-rt3883.c
View File

@ -87,7 +87,7 @@ static int rt3883_pinctrl_probe(struct platform_device *pdev)
} }
static const struct of_device_id rt3883_pinctrl_match[] = { static const struct of_device_id rt3883_pinctrl_match[] = {
{ .compatible = "ralink,rt2880-pinmux" }, { .compatible = "ralink,rt3883-pinctrl" },
{} {}
}; };
MODULE_DEVICE_TABLE(of, rt3883_pinctrl_match); 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 = { static struct platform_driver rt3883_pinctrl_driver = {
.probe = rt3883_pinctrl_probe, .probe = rt3883_pinctrl_probe,
.driver = { .driver = {
.name = "rt2880-pinmux", .name = "rt3883-pinctrl",
.of_match_table = rt3883_pinctrl_match, .of_match_table = rt3883_pinctrl_match,
}, },
}; };