pinctrl: mediatek: paris: Unify probe function by using OF match data

All of the SoCs using Paris pinctrl are defining a custom probe
function that is simply calling mtk_paris_pinctrl_probe() passing
a pointer to the SoC specific mtk_pin_soc structure and nothing else.

Simplify the probe mechanism across all pinctrl drivers that are
using pinctrl-paris by passing the specific mtk_pin_soc as match
data and using function mtk_paris_pinctrl_probe as a common probe
function for all of them.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20220222111144.20796-2-angelogioacchino.delregno@collabora.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt6765.c b/drivers/pinctrl/mediatek/pinctrl-mt6765.c
index 2c59d3936256b7ab6fc224abd21c06430cf1aa6f..c57b19fcda03d4adba9e14ffbc0fbf28f0f91731 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt6765.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt6765.c
@@ -1082,21 +1082,16 @@ static const struct mtk_pin_soc mt6765_data = {
 };
 
 static const struct of_device_id mt6765_pinctrl_of_match[] = {
-       { .compatible = "mediatek,mt6765-pinctrl", },
+       { .compatible = "mediatek,mt6765-pinctrl", .data = &mt6765_data },
        { }
 };
 
-static int mt6765_pinctrl_probe(struct platform_device *pdev)
-{
-       return mtk_paris_pinctrl_probe(pdev, &mt6765_data);
-}
-
 static struct platform_driver mt6765_pinctrl_driver = {
        .driver = {
                .name = "mt6765-pinctrl",
                .of_match_table = mt6765_pinctrl_of_match,
        },
-       .probe = mt6765_pinctrl_probe,
+       .probe = mtk_paris_pinctrl_probe,
 };
 
 static int __init mt6765_pinctrl_init(void)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt6779.c b/drivers/pinctrl/mediatek/pinctrl-mt6779.c
index bb0851c73304bd063882cd8656de0682f8816319..4ddf8bda682790976d6b31acc4a7dfb8196db558 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt6779.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt6779.c
@@ -758,21 +758,16 @@ static const struct mtk_pin_soc mt6779_data = {
 };
 
 static const struct of_device_id mt6779_pinctrl_of_match[] = {
-       { .compatible = "mediatek,mt6779-pinctrl", },
+       { .compatible = "mediatek,mt6779-pinctrl", .data = &mt6779_data },
        { }
 };
 
-static int mt6779_pinctrl_probe(struct platform_device *pdev)
-{
-       return mtk_paris_pinctrl_probe(pdev, &mt6779_data);
-}
-
 static struct platform_driver mt6779_pinctrl_driver = {
        .driver = {
                .name = "mt6779-pinctrl",
                .of_match_table = mt6779_pinctrl_of_match,
        },
-       .probe = mt6779_pinctrl_probe,
+       .probe = mtk_paris_pinctrl_probe,
 };
 
 static int __init mt6779_pinctrl_init(void)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt6797.c b/drivers/pinctrl/mediatek/pinctrl-mt6797.c
index adebe4333ed9e2b79ba378cb0df399f2ad22e0d5..53f240491259108737a11fa42fda9c15cc8dfabc 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt6797.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt6797.c
@@ -58,21 +58,16 @@ static const struct mtk_pin_soc mt6797_data = {
 };
 
 static const struct of_device_id mt6797_pinctrl_of_match[] = {
-       { .compatible = "mediatek,mt6797-pinctrl", },
+       { .compatible = "mediatek,mt6797-pinctrl", .data = &mt6797_data },
        { }
 };
 
-static int mt6797_pinctrl_probe(struct platform_device *pdev)
-{
-       return mtk_paris_pinctrl_probe(pdev, &mt6797_data);
-}
-
 static struct platform_driver mt6797_pinctrl_driver = {
        .driver = {
                .name = "mt6797-pinctrl",
                .of_match_table = mt6797_pinctrl_of_match,
        },
-       .probe = mt6797_pinctrl_probe,
+       .probe = mtk_paris_pinctrl_probe,
 };
 
 static int __init mt6797_pinctrl_init(void)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8183.c b/drivers/pinctrl/mediatek/pinctrl-mt8183.c
index 60318339b618322ea7586568f48df2f5065b99b1..fecb1e64fff4605ab7e169b3d2ac3d3f6ccb5c0b 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8183.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8183.c
@@ -567,22 +567,17 @@ static const struct mtk_pin_soc mt8183_data = {
 };
 
 static const struct of_device_id mt8183_pinctrl_of_match[] = {
-       { .compatible = "mediatek,mt8183-pinctrl", },
+       { .compatible = "mediatek,mt8183-pinctrl", .data = &mt8183_data },
        { }
 };
 
-static int mt8183_pinctrl_probe(struct platform_device *pdev)
-{
-       return mtk_paris_pinctrl_probe(pdev, &mt8183_data);
-}
-
 static struct platform_driver mt8183_pinctrl_driver = {
        .driver = {
                .name = "mt8183-pinctrl",
                .of_match_table = mt8183_pinctrl_of_match,
                .pm = &mtk_paris_pinctrl_pm_ops,
        },
-       .probe = mt8183_pinctrl_probe,
+       .probe = mtk_paris_pinctrl_probe,
 };
 
 static int __init mt8183_pinctrl_init(void)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8192.c b/drivers/pinctrl/mediatek/pinctrl-mt8192.c
index 0c16b2c756bf34474c9b7fde4541fb0b3ad7b6db..acccde9262baeba34d5abfe1d0c1cc70f88c57c1 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8192.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8192.c
@@ -1381,22 +1381,17 @@ static const struct mtk_pin_soc mt8192_data = {
 };
 
 static const struct of_device_id mt8192_pinctrl_of_match[] = {
-       { .compatible = "mediatek,mt8192-pinctrl", },
+       { .compatible = "mediatek,mt8192-pinctrl", .data = &mt8192_data },
        { }
 };
 
-static int mt8192_pinctrl_probe(struct platform_device *pdev)
-{
-       return mtk_paris_pinctrl_probe(pdev, &mt8192_data);
-}
-
 static struct platform_driver mt8192_pinctrl_driver = {
        .driver = {
                .name = "mt8192-pinctrl",
                .of_match_table = mt8192_pinctrl_of_match,
                .pm = &mtk_paris_pinctrl_pm_ops,
        },
-       .probe = mt8192_pinctrl_probe,
+       .probe = mtk_paris_pinctrl_probe,
 };
 
 static int __init mt8192_pinctrl_init(void)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8195.c b/drivers/pinctrl/mediatek/pinctrl-mt8195.c
index 275b7ba4386da4e73618e9f2b12ea9ce4dc5b07b..563693d3d4c20137aafa0d36130251536510b52c 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8195.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8195.c
@@ -959,22 +959,17 @@ static const struct mtk_pin_soc mt8195_data = {
 };
 
 static const struct of_device_id mt8195_pinctrl_of_match[] = {
-       { .compatible = "mediatek,mt8195-pinctrl", },
+       { .compatible = "mediatek,mt8195-pinctrl", .data = &mt8195_data },
        { }
 };
 
-static int mt8195_pinctrl_probe(struct platform_device *pdev)
-{
-       return mtk_paris_pinctrl_probe(pdev, &mt8195_data);
-}
-
 static struct platform_driver mt8195_pinctrl_driver = {
        .driver = {
                .name = "mt8195-pinctrl",
                .of_match_table = mt8195_pinctrl_of_match,
                .pm = &mtk_paris_pinctrl_pm_ops,
        },
-       .probe = mt8195_pinctrl_probe,
+       .probe = mtk_paris_pinctrl_probe,
 };
 
 static int __init mt8195_pinctrl_init(void)

diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
index 85ce7ae5ec6510ac9462f092106ac3a1ccd1f5dd..74517e810958507f009b53d406396475d68bf427 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-paris.c
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
@@ -1021,8 +1021,7 @@ static int mtk_pctrl_build_state(struct platform_device *pdev)
        return 0;
 }
 
-int mtk_paris_pinctrl_probe(struct platform_device *pdev,
-                           const struct mtk_pin_soc *soc)
+int mtk_paris_pinctrl_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct pinctrl_pin_desc *pins;
@@ -1034,7 +1033,11 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
                return -ENOMEM;
 
        platform_set_drvdata(pdev, hw);
-       hw->soc = soc;
+
+       hw->soc = device_get_match_data(dev);
+       if (!hw->soc)
+               return -ENOENT;
+
        hw->dev = &pdev->dev;
 
        if (!hw->soc->nbase_names)

diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.h b/drivers/pinctrl/mediatek/pinctrl-paris.h
index afb7650fd25bd3508a2d0f0330a5ef7265a9a230..8762ac59932927c14d27d9e58542a68335299ecc 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-paris.h
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.h
@@ -57,8 +57,7 @@
                id##_funcs,                             \
        }
 
-int mtk_paris_pinctrl_probe(struct platform_device *pdev,
-                           const struct mtk_pin_soc *soc);
+int mtk_paris_pinctrl_probe(struct platform_device *pdev);
 
 ssize_t mtk_pctrl_show_one_pin(struct mtk_pinctrl *hw,
        unsigned int gpio, char *buf, unsigned int bufLen);