[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CANqRtoRs_uiBGCTa=+M0turFpyyf1kAfohzyqoRBvgKmo1eg=Q@mail.gmail.com>
Date: Mon, 22 Jun 2015 18:45:30 +0900
From: Magnus Damm <magnus.damm@...il.com>
To: Geert Uytterhoeven <geert@...ux-m68k.org>
Cc: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
Laurent Pinchart <laurent.pinchart+renesas@...asonboard.com>,
Geert Uytterhoeven <geert+renesas@...der.be>,
Linux-sh list <linux-sh@...r.kernel.org>,
Daniel Lezcano <daniel.lezcano@...aro.org>,
Simon Horman <horms+renesas@...ge.net.au>,
Thomas Gleixner <tglx@...utronix.de>
Subject: Re: [PATCH 02/08] clocksource: sh_cmt: Use 0x3f mask for SH_CMT_48BIT case
On Mon, Jun 22, 2015 at 6:43 PM, Geert Uytterhoeven
<geert@...ux-m68k.org> wrote:
> On Sun, Jun 21, 2015 at 10:09 AM, Magnus Damm <magnus.damm@...il.com> wrote:
>> From: Magnus Damm <damm+renesas@...nsource.se>
>>
>> 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@...nsource.se>
>> ---
>>
>> 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"
Ouch, will fix. Thanks!
/ magnus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists