clocksource/drivers/sh_cmt: Remove unused "renesas, channels-mask" handling
The in-driver channel configuration in sh_cmt_info.channels_mask is now
always set for all CMT devices instantiated from DT.
Hence the "renesas,channels-mask" property is no longer checked, and its
handling can be removed, cfr. commit 4e18111ff3
("devicetree:
bindings: Remove deprecated properties").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
Родитель
8d50e9476b
Коммит
d1d285972e
|
@ -946,14 +946,6 @@ static const struct of_device_id sh_cmt_of_table[] __maybe_unused = {
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, sh_cmt_of_table);
|
MODULE_DEVICE_TABLE(of, sh_cmt_of_table);
|
||||||
|
|
||||||
static int sh_cmt_parse_dt(struct sh_cmt_device *cmt)
|
|
||||||
{
|
|
||||||
struct device_node *np = cmt->pdev->dev.of_node;
|
|
||||||
|
|
||||||
return of_property_read_u32(np, "renesas,channels-mask",
|
|
||||||
&cmt->hw_channels);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev)
|
static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
unsigned int mask;
|
unsigned int mask;
|
||||||
|
@ -968,15 +960,7 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev)
|
||||||
|
|
||||||
id = of_match_node(sh_cmt_of_table, pdev->dev.of_node);
|
id = of_match_node(sh_cmt_of_table, pdev->dev.of_node);
|
||||||
cmt->info = id->data;
|
cmt->info = id->data;
|
||||||
|
cmt->hw_channels = cmt->info->channels_mask;
|
||||||
/* prefer in-driver channel configuration over DT */
|
|
||||||
if (cmt->info->channels_mask) {
|
|
||||||
cmt->hw_channels = cmt->info->channels_mask;
|
|
||||||
} else {
|
|
||||||
ret = sh_cmt_parse_dt(cmt);
|
|
||||||
if (ret < 0)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
} else if (pdev->dev.platform_data) {
|
} else if (pdev->dev.platform_data) {
|
||||||
struct sh_timer_config *cfg = pdev->dev.platform_data;
|
struct sh_timer_config *cfg = pdev->dev.platform_data;
|
||||||
const struct platform_device_id *id = pdev->id_entry;
|
const struct platform_device_id *id = pdev->id_entry;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче