From mboxrd@z Thu Jan 1 00:00:00 1970 From: Magnus Damm Date: Mon, 22 Jun 2015 09:45:30 +0000 Subject: Re: [PATCH 02/08] clocksource: sh_cmt: Use 0x3f mask for SH_CMT_48BIT case Message-Id: List-Id: References: <20150621080903.10187.20998.sendpatchset@little-apple> <20150621080927.10187.98007.sendpatchset@little-apple> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Geert Uytterhoeven Cc: "linux-kernel@vger.kernel.org" , "devicetree@vger.kernel.org" , Laurent Pinchart , Geert Uytterhoeven , Linux-sh list , Daniel Lezcano , Simon Horman , Thomas Gleixner On Mon, Jun 22, 2015 at 6:43 PM, Geert Uytterhoeven wrote: > 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" Ouch, will fix. Thanks! / magnus -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933244AbbFVJpj (ORCPT ); Mon, 22 Jun 2015 05:45:39 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:37120 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753173AbbFVJpb (ORCPT ); Mon, 22 Jun 2015 05:45:31 -0400 MIME-Version: 1.0 In-Reply-To: References: <20150621080903.10187.20998.sendpatchset@little-apple> <20150621080927.10187.98007.sendpatchset@little-apple> Date: Mon, 22 Jun 2015 18:45:30 +0900 Message-ID: Subject: Re: [PATCH 02/08] clocksource: sh_cmt: Use 0x3f mask for SH_CMT_48BIT case From: Magnus Damm To: Geert Uytterhoeven 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 On Mon, Jun 22, 2015 at 6:43 PM, Geert Uytterhoeven wrote: > 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" 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/ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Magnus Damm Subject: Re: [PATCH 02/08] clocksource: sh_cmt: Use 0x3f mask for SH_CMT_48BIT case Date: Mon, 22 Jun 2015 18:45:30 +0900 Message-ID: References: <20150621080903.10187.20998.sendpatchset@little-apple> <20150621080927.10187.98007.sendpatchset@little-apple> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: In-Reply-To: Sender: linux-sh-owner@vger.kernel.org To: Geert Uytterhoeven Cc: "linux-kernel@vger.kernel.org" , "devicetree@vger.kernel.org" , Laurent Pinchart , Geert Uytterhoeven , Linux-sh list , Daniel Lezcano , Simon Horman , Thomas Gleixner List-Id: devicetree@vger.kernel.org On Mon, Jun 22, 2015 at 6:43 PM, Geert Uytterhoeven wrote: > 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" Ouch, will fix. Thanks! / magnus -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in