Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752271AbaBNQZm (ORCPT ); Fri, 14 Feb 2014 11:25:42 -0500 Received: from perceval.ideasonboard.com ([95.142.166.194]:42145 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751551AbaBNQZk (ORCPT ); Fri, 14 Feb 2014 11:25:40 -0500 From: Laurent Pinchart To: Sergei Shtylyov Cc: Laurent Pinchart , linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Lezcano , Thomas Gleixner Subject: Re: [PATCH 26/27] ARM: shmobile: lager-reference: Enable CMT0 in device tree Date: Fri, 14 Feb 2014 17:26:44 +0100 Message-ID: <1395114.O6aqLXJV0J@avalon> User-Agent: KMail/4.11.5 (Linux/3.10.25-gentoo; KDE/4.11.5; x86_64; ; ) In-Reply-To: <52FE29DB.2010304@cogentembedded.com> References: <1392339605-20691-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> <2354725.yUCM3gQqXi@avalon> <52FE29DB.2010304@cogentembedded.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Sergei, On Friday 14 February 2014 18:36:11 Sergei Shtylyov wrote: > Hello. > > On 14-02-2014 18:22, Laurent Pinchart wrote: > >>>>> Enable the CMT0 device and configure channel 0 as a clock event > >>>>> provider. > >>>>> > >>>>> Signed-off-by: Laurent Pinchart > >>>>> > >>>>> > >>>>> diff --git a/arch/arm/mach-shmobile/include/mach/r8a7790.h > >>>>> b/arch/arm/mach-shmobile/include/mach/r8a7790.h index 0b95bab..62b31f3 > >>>>> 100644 --- a/arch/arm/mach-shmobile/include/mach/r8a7790.h > >>>>> +++ b/arch/arm/mach-shmobile/include/mach/r8a7790.h > >>>>> @@ -29,7 +29,6 @@ enum { > >>>>> > >>>>> }; > >>>>> > >>>>> void r8a7790_add_standard_devices(void); > >>>>> > >>>>> -void r8a7790_add_dt_devices(void); > >>>>> > >>>>> void r8a7790_clock_init(void); > >>>>> void r8a7790_pinmux_init(void); > >>>>> void r8a7790_pm_init(void); > >>>>> > >>>>> diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c > >>>>> b/arch/arm/mach-shmobile/setup-r8a7790.c index 3e5813f..462c81f 100644 > >>>>> --- a/arch/arm/mach-shmobile/setup-r8a7790.c > >>>>> +++ b/arch/arm/mach-shmobile/setup-r8a7790.c > >>>>> @@ -294,11 +294,6 @@ static struct resource cmt0_resources[] = { > >>>>> &cmt##idx##_platform_data, \ > >>>>> sizeof(struct sh_timer_config)) > >>>>> > >>>>> -void __init r8a7790_add_dt_devices(void) > >>>>> -{ > >>>>> - r8a7790_register_cmt(0); > >>>>> -} > >>>>> - > >>>>> void __init r8a7790_add_standard_devices(void) > >>>>> { > >>>>> r8a7790_register_scif(0); > >>>>> @@ -311,7 +306,7 @@ void __init r8a7790_add_standard_devices(void) > >>>>> r8a7790_register_scif(7); > >>>>> r8a7790_register_scif(8); > >>>>> r8a7790_register_scif(9); > >>>>> - r8a7790_add_dt_devices(); > >>>>> + r8a7790_register_cmt(0); > >>>>> r8a7790_register_irqc(0); > >>>>> r8a7790_register_thermal(); > >>>>> } > >>>> > >>>> IMHO, these 2 files should be split into a separate patch. > >>> > >>> That could easily be done, but why ? > >> > >> It does not seem necessary to combine these changes in one patch. > >> Remember, Simon has separate branches for boards and SoCs. So finally > >> it's up to him to decide on this... > > > > Right, but in this case I need to remove the CMT platform device > > registration from r8a7790_add_dt_devices() > > You're not removing anything in these 2 files, you're just replacing > "indirect" call to r8a7790_register_cmt(0) with direct. OK, I see what you mean now. Given that the patch removes the r8a7790_add_dt_devices() call from arch/arm/mach-shmobile/board-lager- reference.c, I could indeed split those two changes into a separate patch as there's no-one calling the function anymore. That would introduce a dependency between the branches, which might not be better. I'll let Simon comment on what he would prefer and will act accordingly. -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/