Commit c8c206cd authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Linus Walleij
Browse files

pinctrl: mediatek: common-v1: Use common probe function 



Most of the mediatek pinctrl drivers are calling mtk_pctrl_init() and
passing only a pointer to struct mtk_pinctrl_devdata, as the regmap
handle it passed from device-tree, with the exception of mt6397.

For all of the drivers that don't require passing a struct regmap
pointer from a parent device, simplify the probe mechanism by assigning
the required structure as match data and use mtk_pctrl_common_probe()
as their probe function.

While at it, also collapse the of_device_id entries to a single line,
as they all fit in max 83 columns, which is acceptable.

Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20220222111144.20796-4-angelogioacchino.delregno@collabora.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent e091feda

drivers/pinctrl/mediatek/pinctrl-mt2701.c

+3 −8
Original line number Diff line number Diff line
@@ -534,20 +534,15 @@ static const struct mtk_pinctrl_devdata mt2701_pinctrl_data = { 
	},

};



static int mt2701_pinctrl_probe(struct platform_device *pdev)

{

	return mtk_pctrl_init(pdev, &mt2701_pinctrl_data, NULL);

}



static const struct of_device_id mt2701_pctrl_match[] = {

	{ .compatible = "mediatek,mt2701-pinctrl", },

	{ .compatible = "mediatek,mt7623-pinctrl", },

	{ .compatible = "mediatek,mt2701-pinctrl", .data = &mt2701_pinctrl_data },

	{ .compatible = "mediatek,mt7623-pinctrl", .data = &mt2701_pinctrl_data },

	{}

};

MODULE_DEVICE_TABLE(of, mt2701_pctrl_match);



static struct platform_driver mtk_pinctrl_driver = {

	.probe = mt2701_pinctrl_probe,

	.probe = mtk_pctrl_common_probe,

	.driver = {

		.name = "mediatek-mt2701-pinctrl",

		.of_match_table = mt2701_pctrl_match,

drivers/pinctrl/mediatek/pinctrl-mt2712.c

+2 −9
Original line number Diff line number Diff line
@@ -587,21 +587,14 @@ static const struct mtk_pinctrl_devdata mt2712_pinctrl_data = { 
	},

};



static int mt2712_pinctrl_probe(struct platform_device *pdev)

{

	return mtk_pctrl_init(pdev, &mt2712_pinctrl_data, NULL);

}



static const struct of_device_id mt2712_pctrl_match[] = {

	{

		.compatible = "mediatek,mt2712-pinctrl",

	},

	{ .compatible = "mediatek,mt2712-pinctrl", .data = &mt2712_pinctrl_data },

	{ }

};

MODULE_DEVICE_TABLE(of, mt2712_pctrl_match);



static struct platform_driver mtk_pinctrl_driver = {

	.probe = mt2712_pinctrl_probe,

	.probe = mtk_pctrl_common_probe,

	.driver = {

		.name = "mediatek-mt2712-pinctrl",

		.of_match_table = mt2712_pctrl_match,

drivers/pinctrl/mediatek/pinctrl-mt8127.c

+2 −7
Original line number Diff line number Diff line
@@ -303,18 +303,13 @@ static const struct mtk_pinctrl_devdata mt8127_pinctrl_data = { 
	},

};



static int mt8127_pinctrl_probe(struct platform_device *pdev)

{

	return mtk_pctrl_init(pdev, &mt8127_pinctrl_data, NULL);

}



static const struct of_device_id mt8127_pctrl_match[] = {

	{ .compatible = "mediatek,mt8127-pinctrl", },

	{ .compatible = "mediatek,mt8127-pinctrl", .data = &mt8127_pinctrl_data },

	{ }

};



static struct platform_driver mtk_pinctrl_driver = {

	.probe = mt8127_pinctrl_probe,

	.probe = mtk_pctrl_common_probe,

	.driver = {

		.name = "mediatek-mt8127-pinctrl",

		.of_match_table = mt8127_pctrl_match,

drivers/pinctrl/mediatek/pinctrl-mt8135.c

+2 −9
Original line number Diff line number Diff line
@@ -316,20 +316,13 @@ static const struct mtk_pinctrl_devdata mt8135_pinctrl_data = { 
	},

};



static int mt8135_pinctrl_probe(struct platform_device *pdev)

{

	return mtk_pctrl_init(pdev, &mt8135_pinctrl_data, NULL);

}



static const struct of_device_id mt8135_pctrl_match[] = {

	{

		.compatible = "mediatek,mt8135-pinctrl",

	},

	{ .compatible = "mediatek,mt8135-pinctrl", .data = &mt8135_pinctrl_data },

	{ }

};



static struct platform_driver mtk_pinctrl_driver = {

	.probe = mt8135_pinctrl_probe,

	.probe = mtk_pctrl_common_probe,

	.driver = {

		.name = "mediatek-mt8135-pinctrl",

		.of_match_table = mt8135_pctrl_match,

drivers/pinctrl/mediatek/pinctrl-mt8167.c

+2 −9
Original line number Diff line number Diff line
@@ -335,22 +335,15 @@ static const struct mtk_pinctrl_devdata mt8167_pinctrl_data = { 
	},

};



static int mt8167_pinctrl_probe(struct platform_device *pdev)

{

	return mtk_pctrl_init(pdev, &mt8167_pinctrl_data, NULL);

}



static const struct of_device_id mt8167_pctrl_match[] = {

	{

		.compatible = "mediatek,mt8167-pinctrl",

	},

	{ .compatible = "mediatek,mt8167-pinctrl", .data = &mt8167_pinctrl_data },

	{}

};



MODULE_DEVICE_TABLE(of, mt8167_pctrl_match);



static struct platform_driver mtk_pinctrl_driver = {

	.probe = mt8167_pinctrl_probe,

	.probe = mtk_pctrl_common_probe,

	.driver = {

		.name = "mediatek-mt8167-pinctrl",

		.of_match_table = mt8167_pctrl_match,