Commit 60b8de2b authored by Frank Li's avatar Frank Li Committed by Hans Verkuil
Browse files

media: nxp: imx8-isi: Use devm_clk_bulk_get_all() to fetch clocks 



Use devm_clk_bulk_get_all() helper to simplify clock handle code.

No functional changes intended.

Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://lore.kernel.org/r/20250522-8qxp_camera-v5-4-d4be869fdb7e@nxp.com


Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
parent 66ede6d7

drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c

+5 −41
Original line number Diff line number Diff line
@@ -275,11 +275,6 @@ static const struct mxc_isi_set_thd mxc_imx8_isi_thd_v1 = { 
	.panic_set_thd_v = { .mask = 0xf0000, .offset = 16, .threshold = 0x7 },

};



static const struct clk_bulk_data mxc_imx8mn_clks[] = {

	{ .id = "axi" },

	{ .id = "apb" },

};



static const struct mxc_isi_plat_data mxc_imx8mn_data = {

	.model			= MXC_ISI_IMX8MN,

	.num_ports		= 1,
@@ -287,8 +282,6 @@ static const struct mxc_isi_plat_data mxc_imx8mn_data = { 
	.reg_offset		= 0,

	.ier_reg		= &mxc_imx8_isi_ier_v1,

	.set_thd		= &mxc_imx8_isi_thd_v1,

	.clks			= mxc_imx8mn_clks,

	.num_clks		= ARRAY_SIZE(mxc_imx8mn_clks),

	.buf_active_reverse	= false,

	.gasket_ops		= &mxc_imx8_gasket_ops,

	.has_36bit_dma		= false,
@@ -301,8 +294,6 @@ static const struct mxc_isi_plat_data mxc_imx8mp_data = { 
	.reg_offset		= 0x2000,

	.ier_reg		= &mxc_imx8_isi_ier_v2,

	.set_thd		= &mxc_imx8_isi_thd_v1,

	.clks			= mxc_imx8mn_clks,

	.num_clks		= ARRAY_SIZE(mxc_imx8mn_clks),

	.buf_active_reverse	= true,

	.gasket_ops		= &mxc_imx8_gasket_ops,

	.has_36bit_dma		= true,
@@ -315,8 +306,6 @@ static const struct mxc_isi_plat_data mxc_imx8ulp_data = { 
	.reg_offset		= 0x0,

	.ier_reg		= &mxc_imx8_isi_ier_v2,

	.set_thd		= &mxc_imx8_isi_thd_v1,

	.clks			= mxc_imx8mn_clks,

	.num_clks		= ARRAY_SIZE(mxc_imx8mn_clks),

	.buf_active_reverse	= true,

	.has_36bit_dma		= false,

};
@@ -328,8 +317,6 @@ static const struct mxc_isi_plat_data mxc_imx93_data = { 
	.reg_offset		= 0,

	.ier_reg		= &mxc_imx8_isi_ier_v2,

	.set_thd		= &mxc_imx8_isi_thd_v1,

	.clks			= mxc_imx8mn_clks,

	.num_clks		= ARRAY_SIZE(mxc_imx8mn_clks),

	.buf_active_reverse	= true,

	.gasket_ops		= &mxc_imx93_gasket_ops,

	.has_36bit_dma		= false,
@@ -386,7 +373,7 @@ static int mxc_isi_runtime_suspend(struct device *dev) 
{

	struct mxc_isi_dev *isi = dev_get_drvdata(dev);



	clk_bulk_disable_unprepare(isi->pdata->num_clks, isi->clks);

	clk_bulk_disable_unprepare(isi->num_clks, isi->clks);



	return 0;

}
@@ -396,7 +383,7 @@ static int mxc_isi_runtime_resume(struct device *dev) 
	struct mxc_isi_dev *isi = dev_get_drvdata(dev);

	int ret;



	ret = clk_bulk_prepare_enable(isi->pdata->num_clks, isi->clks);

	ret = clk_bulk_prepare_enable(isi->num_clks, isi->clks);

	if (ret) {

		dev_err(dev, "Failed to enable clocks (%d)\n", ret);

		return ret;
@@ -414,27 +401,6 @@ static const struct dev_pm_ops mxc_isi_pm_ops = { 
 * Probe, remove & driver

 */



static int mxc_isi_clk_get(struct mxc_isi_dev *isi)

{

	unsigned int size = isi->pdata->num_clks

			  * sizeof(*isi->clks);

	int ret;



	isi->clks = devm_kmemdup(isi->dev, isi->pdata->clks, size, GFP_KERNEL);

	if (!isi->clks)

		return -ENOMEM;



	ret = devm_clk_bulk_get(isi->dev, isi->pdata->num_clks,

				isi->clks);

	if (ret < 0) {

		dev_err(isi->dev, "Failed to acquire clocks: %d\n",

			ret);

		return ret;

	}



	return 0;

}



static int mxc_isi_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -457,11 +423,9 @@ static int mxc_isi_probe(struct platform_device *pdev) 
	if (!isi->pipes)

		return -ENOMEM;



	ret = mxc_isi_clk_get(isi);

	if (ret < 0) {

		dev_err(dev, "Failed to get clocks\n");

		return ret;

	}

	isi->num_clks = devm_clk_bulk_get_all(dev, &isi->clks);

	if (isi->num_clks < 0)

		return dev_err_probe(dev, isi->num_clks, "Failed to get clocks\n");



	isi->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(isi->regs)) {

drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h

+1 −2
Original line number Diff line number Diff line
@@ -169,8 +169,6 @@ struct mxc_isi_plat_data { 
	const struct mxc_isi_ier_reg  *ier_reg;

	const struct mxc_isi_set_thd *set_thd;

	const struct mxc_gasket_ops *gasket_ops;

	const struct clk_bulk_data *clks;

	unsigned int num_clks;

	bool buf_active_reverse;

	bool has_36bit_dma;

};
@@ -282,6 +280,7 @@ struct mxc_isi_dev { 


	void __iomem			*regs;

	struct clk_bulk_data		*clks;

	int				num_clks;

	struct regmap			*gasket;



	struct mxc_isi_crossbar		crossbar;