On Sun, Jun 21, 2015 at 10:09 AM, Magnus Damm <magnus.damm@xxxxxxxxx> wrote:
> From: Magnus Damm <damm+renesas@xxxxxxxxxxxxx>
>
> Always use 0x3f as channel mask for the SH_CMT_48BIT type of devices.
> Once this patch is applied the "renesas,channels-mask" property will
> be ignored by the driver for older devices matching SH_CMT_48BIT. In
> the future when all CMT types store channel mask in the driver then
> we will be able to deprecate and remove "renesas,channels-mask" from DTS.
>
> Signed-off-by: Magnus Damm <damm+renesas@xxxxxxxxxxxxx>
> ---
>
> drivers/clocksource/sh_cmt.c | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
> --- 0001/drivers/clocksource/sh_cmt.c
> +++ work/drivers/clocksource/sh_cmt.c 2015-06-20 15:25:54.302366518 +0900
> @@ -969,9 +972,14 @@ static int sh_cmt_setup(struct sh_cmt_de
> id = of_match_node(sh_cmt_of_table, pdev->dev.of_node);
> cmt->info = id->data;
>
> - ret = sh_cmt_parse_dt(cmt);
> - if (ret < 0)
> - return ret;
> + /* prefer in-driver channel configuration over DT */
> + if (cmt->info->channels_mask) {
> + cmt->hw_channels = cmt->info_channels_mask;
drivers/clocksource/sh_cmt.c: In function 'sh_cmt_setup':
drivers/clocksource/sh_cmt.c:996:26: error: 'struct sh_cmt_device' has
no member named 'info_channels_mask'
cmt->hw_channels = cmt->info_channels_mask;
^
"cmt->info->channels_mask"
> + } else {
> + ret = sh_cmt_parse_dt(cmt);
> + if (ret < 0)
> + return ret;
> + }
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
