Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5de49f4 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

clocksource: sh_tmu: Allocate channels dynamically 



This prepares the driver for multi-channel support.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
parent 3b77a83e

drivers/clocksource/sh_tmu.c

+20 −7
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ struct sh_tmu_device { 
	void __iomem *mapbase;

	struct clk *clk;



	struct sh_tmu_channel channel;

	struct sh_tmu_channel *channels;

	unsigned int num_channels;

};



static DEFINE_RAW_SPINLOCK(sh_tmu_lock);
@@ -469,6 +470,7 @@ static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) 
{

	struct sh_timer_config *cfg = pdev->dev.platform_data;

	struct resource *res;

	void __iomem *base;

	int ret;

	ret = -ENXIO;
@@ -488,16 +490,16 @@ static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) 
	}



	/*

	 * Map memory, let channel.base point to our channel and mapbase to the

	 * Map memory, let base point to our channel and mapbase to the

	 * start/stop shared register.

	 */

	tmu->channel.base = ioremap_nocache(res->start, resource_size(res));

	if (tmu->channel.base == NULL) {

	base = ioremap_nocache(res->start, resource_size(res));

	if (base == NULL) {

		dev_err(&tmu->pdev->dev, "failed to remap I/O memory\n");

		goto err0;

	}



	tmu->mapbase = tmu->channel.base - cfg->channel_offset;

	tmu->mapbase = base - cfg->channel_offset;



	/* get hold of clock */

	tmu->clk = clk_get(&tmu->pdev->dev, "tmu_fck");
@@ -511,18 +513,29 @@ static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) 
	if (ret < 0)

		goto err2;



	ret = sh_tmu_channel_setup(&tmu->channel, tmu);

	tmu->channels = kzalloc(sizeof(*tmu->channels), GFP_KERNEL);

	if (tmu->channels == NULL) {

		ret = -ENOMEM;

		goto err3;

	}



	tmu->num_channels = 1;



	tmu->channels[0].base = base;



	ret = sh_tmu_channel_setup(&tmu->channels[0], tmu);

	if (ret < 0)

		goto err3;



	return 0;



 err3:

	kfree(tmu->channels);

	clk_unprepare(tmu->clk);

 err2:

	clk_put(tmu->clk);

 err1:

	iounmap(tmu->channel.base);

	iounmap(base);

 err0:

	return ret;

}