Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754791AbbFVJnZ (ORCPT ); Mon, 22 Jun 2015 05:43:25 -0400 Received: from mail-ob0-f171.google.com ([209.85.214.171]:34600 "EHLO mail-ob0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753925AbbFVJnR (ORCPT ); Mon, 22 Jun 2015 05:43:17 -0400 MIME-Version: 1.0 In-Reply-To: <20150621080927.10187.98007.sendpatchset@little-apple> References: <20150621080903.10187.20998.sendpatchset@little-apple> <20150621080927.10187.98007.sendpatchset@little-apple> Date: Mon, 22 Jun 2015 11:43:17 +0200 X-Google-Sender-Auth: mZ63qVuzS0WWBLQq2tQUnoOqKag Message-ID: Subject: Re: [PATCH 02/08] clocksource: sh_cmt: Use 0x3f mask for SH_CMT_48BIT case From: Geert Uytterhoeven To: Magnus Damm Cc: "linux-kernel@vger.kernel.org" , "devicetree@vger.kernel.org" , Laurent Pinchart , Geert Uytterhoeven , Linux-sh list , Daniel Lezcano , Simon Horman , Thomas Gleixner Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2197 Lines: 56 On Sun, Jun 21, 2015 at 10:09 AM, Magnus Damm wrote: > From: Magnus Damm > > 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 > --- > > 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@linux-m68k.org 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 linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/