redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

clocksource: sh_cmt: Allocate channels dynamically 

This prepares the driver for multi-channel support.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
hifive-unleashed-5.1
Laurent Pinchart 2014-01-27 22:04:17 +01:00
parent b262bc74dc
commit f5ec9b194a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/clocksource/sh_cmt.c
View File

@ -62,7 +62,8 @@ struct sh_cmt_device {
void __iomem *mapbase;
struct clk *clk;
struct sh_cmt_channel channel;
struct sh_cmt_channel *channels;
unsigned int num_channels;
unsigned long width; /* 16 or 32 bit version of hardware block */
unsigned long overflow_bit;
@ -822,7 +823,15 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev)
cmt->clear_bits = ~0xc000;
}
ret = sh_cmt_setup_channel(&cmt->channel, cfg->timer_bit, cmt);
cmt->channels = kzalloc(sizeof(*cmt->channels), GFP_KERNEL);
if (cmt->channels == NULL) {
ret = -ENOMEM;
goto err4;
}
cmt->num_channels = 1;
ret = sh_cmt_setup_channel(&cmt->channels[0], cfg->timer_bit, cmt);
if (ret < 0)
goto err4;
@ -830,6 +839,7 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev)
return 0;
err4:
kfree(cmt->channels);
clk_unprepare(cmt->clk);
err3:
clk_put(cmt->clk);