Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752996AbaBNOgK (ORCPT ); Fri, 14 Feb 2014 09:36:10 -0500 Received: from mail-lb0-f175.google.com ([209.85.217.175]:50273 "EHLO mail-lb0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751059AbaBNOgI (ORCPT ); Fri, 14 Feb 2014 09:36:08 -0500 Message-ID: <52FE29DB.2010304@cogentembedded.com> Date: Fri, 14 Feb 2014 18:36:11 +0400 From: Sergei Shtylyov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Laurent Pinchart 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 References: <1392339605-20691-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> <2244047.l1cecWDdMU@avalon> <52FE2498.8040609@cogentembedded.com> <2354725.yUCM3gQqXi@avalon> In-Reply-To: <2354725.yUCM3gQqXi@avalon> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. WBR, Sergei -- 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/