Commit 65c10c50 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Stephen Boyd
Browse files

clk: mediatek: Migrate to mtk_clk_pdev_probe() for multimedia clocks 



Reduce duplication and simplify all MediaTek multimedia clock drivers
by migrating away from defining custom probe functions for each driver
and instead use mtk_clk_pdev_probe().

While at it, also add a .remove() callback to all of the multimedia
clock drivers where missing.

Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Tested-by: default avatarMiles Chen <miles.chen@mediatek.com>
Tested-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20230306140543.1813621-4-angelogioacchino.delregno@collabora.com


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 25209124

drivers/clk/mediatek/clk-mt2701-mm.c

+11 −20
Original line number Diff line number Diff line
@@ -79,32 +79,23 @@ static const struct mtk_gate mm_clks[] = { 
	GATE_DISP1(CLK_MM_TVE_FMM, "mm_tve_fmm", "mm_sel", 14),

};



static int clk_mt2701_mm_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->parent->of_node;

	struct clk_hw_onecell_data *clk_data;

	int r;



	clk_data = mtk_alloc_clk_data(CLK_MM_NR);



	mtk_clk_register_gates(&pdev->dev, node, mm_clks,

			       ARRAY_SIZE(mm_clks), clk_data);



	r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);

	if (r)

		dev_err(&pdev->dev,

			"could not register clock provider: %s: %d\n",

			pdev->name, r);

static const struct mtk_clk_desc mm_desc = {

	.clks = mm_clks,

	.num_clks = ARRAY_SIZE(mm_clks),

};



	return r;

}

static const struct platform_device_id clk_mt2701_mm_id_table[] = {

	{ .name = "clk-mt2701-mm", .driver_data = (kernel_ulong_t)&mm_desc },

	{ /* sentinel */ }

};



static struct platform_driver clk_mt2701_mm_drv = {

	.probe = clk_mt2701_mm_probe,

	.probe = mtk_clk_pdev_probe,

	.remove = mtk_clk_pdev_remove,

	.driver = {

		.name = "clk-mt2701-mm",

	},

	.id_table = clk_mt2701_mm_id_table,

};



builtin_platform_driver(clk_mt2701_mm_drv);

drivers/clk/mediatek/clk-mt2712-mm.c

+11 −20
Original line number Diff line number Diff line
@@ -126,32 +126,23 @@ static const struct mtk_gate mm_clks[] = { 
	GATE_MM2(CLK_MM_DSI3_DIGITAL, "mm_dsi3_digital", "dsi1_lntc", 6),

};



static int clk_mt2712_mm_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->parent->of_node;

	struct clk_hw_onecell_data *clk_data;

	int r;



	clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);



	mtk_clk_register_gates(&pdev->dev, node, mm_clks,

			       ARRAY_SIZE(mm_clks), clk_data);



	r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);



	if (r != 0)

		pr_err("%s(): could not register clock provider: %d\n",

			__func__, r);

static const struct mtk_clk_desc mm_desc = {

	.clks = mm_clks,

	.num_clks = ARRAY_SIZE(mm_clks),

};



	return r;

}

static const struct platform_device_id clk_mt2712_mm_id_table[] = {

	{ .name = "clk-mt2712-mm", .driver_data = (kernel_ulong_t)&mm_desc },

	{ /* sentinel */ }

};



static struct platform_driver clk_mt2712_mm_drv = {

	.probe = clk_mt2712_mm_probe,

	.probe = mtk_clk_pdev_probe,

	.remove = mtk_clk_pdev_remove,

	.driver = {

		.name = "clk-mt2712-mm",

	},

	.id_table = clk_mt2712_mm_id_table,

};



builtin_platform_driver(clk_mt2712_mm_drv);

drivers/clk/mediatek/clk-mt6779-mm.c

+11 −13
Original line number Diff line number Diff line
@@ -85,25 +85,23 @@ static const struct mtk_gate mm_clks[] = { 
	GATE_MM1(CLK_MM_DISP_OVL_FBDC, "mm_disp_ovl_fbdc", "mm_sel", 16),

};



static int clk_mt6779_mm_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->parent->of_node;

	struct clk_hw_onecell_data *clk_data;



	clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);



	mtk_clk_register_gates(&pdev->dev, node, mm_clks,

			       ARRAY_SIZE(mm_clks), clk_data);

static const struct mtk_clk_desc mm_desc = {

	.clks = mm_clks,

	.num_clks = ARRAY_SIZE(mm_clks),

};



	return of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);

}

static const struct platform_device_id clk_mt6779_mm_id_table[] = {

	{ .name = "clk-mt6779-mm", .driver_data = (kernel_ulong_t)&mm_desc },

	{ /* sentinel */ }

};



static struct platform_driver clk_mt6779_mm_drv = {

	.probe = clk_mt6779_mm_probe,

	.probe = mtk_clk_pdev_probe,

	.remove = mtk_clk_pdev_remove,

	.driver = {

		.name = "clk-mt6779-mm",

	},

	.id_table = clk_mt6779_mm_id_table,

};



module_platform_driver(clk_mt6779_mm_drv);

drivers/clk/mediatek/clk-mt6795-mm.c

+11 −44
Original line number Diff line number Diff line
@@ -76,56 +76,23 @@ static const struct mtk_gate mm_gates[] = { 
	GATE_MM1(CLK_MM_DPI_ENGINE, "mm_dpi_engine", "mm_sel", 9),

};



static int clk_mt6795_mm_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->parent->of_node;

	struct clk_hw_onecell_data *clk_data;

	int ret;



	clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);

	if (!clk_data)

		return -ENOMEM;



	ret = mtk_clk_register_gates(&pdev->dev, node, mm_gates,

				     ARRAY_SIZE(mm_gates), clk_data);

	if (ret)

		goto free_clk_data;



	ret = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);

	if (ret)

		goto unregister_gates;



	platform_set_drvdata(pdev, clk_data);



	return 0;



unregister_gates:

	mtk_clk_unregister_gates(mm_gates, ARRAY_SIZE(mm_gates), clk_data);

free_clk_data:

	mtk_free_clk_data(clk_data);

	return ret;

}



static int clk_mt6795_mm_remove(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->parent->of_node;

	struct clk_hw_onecell_data *clk_data = platform_get_drvdata(pdev);



	of_clk_del_provider(node);

	mtk_clk_unregister_gates(mm_gates, ARRAY_SIZE(mm_gates), clk_data);

	mtk_free_clk_data(clk_data);

static const struct mtk_clk_desc mm_desc = {

	.clks = mm_gates,

	.num_clks = ARRAY_SIZE(mm_gates),

};



	return 0;

}

static const struct platform_device_id clk_mt6795_mm_id_table[] = {

	{ .name = "clk-mt6795-mm", .driver_data = (kernel_ulong_t)&mm_desc },

	{ /* sentinel */ }

};



static struct platform_driver clk_mt6795_mm_drv = {

	.driver = {

		.name = "clk-mt6795-mm",

	},

	.probe = clk_mt6795_mm_probe,

	.remove = clk_mt6795_mm_remove,

	.id_table = clk_mt6795_mm_id_table,

	.probe = mtk_clk_pdev_probe,

	.remove = mtk_clk_pdev_remove,

};

module_platform_driver(clk_mt6795_mm_drv);

drivers/clk/mediatek/clk-mt6797-mm.c

+11 −20
Original line number Diff line number Diff line
@@ -92,32 +92,23 @@ static const struct mtk_gate mm_clks[] = { 
		 "clk26m", 3),

};



static int clk_mt6797_mm_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->parent->of_node;

	struct clk_hw_onecell_data *clk_data;

	int r;



	clk_data = mtk_alloc_clk_data(CLK_MM_NR);



	mtk_clk_register_gates(&pdev->dev, node, mm_clks,

			       ARRAY_SIZE(mm_clks), clk_data);



	r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);

	if (r)

		dev_err(&pdev->dev,

			"could not register clock provider: %s: %d\n",

			pdev->name, r);

static const struct mtk_clk_desc mm_desc = {

	.clks = mm_clks,

	.num_clks = ARRAY_SIZE(mm_clks),

};



	return r;

}

static const struct platform_device_id clk_mt6797_mm_id_table[] = {

	{ .name = "clk-mt6797-mm", .driver_data = (kernel_ulong_t)&mm_desc },

	{ /* sentinel */ }

};



static struct platform_driver clk_mt6797_mm_drv = {

	.probe = clk_mt6797_mm_probe,

	.probe = mtk_clk_pdev_probe,

	.remove = mtk_clk_pdev_remove,

	.driver = {

		.name = "clk-mt6797-mm",

	},

	.id_table = clk_mt6797_mm_id_table,

};



builtin_platform_driver(clk_mt6797_mm_drv);