From mboxrd@z Thu Jan 1 00:00:00 1970 From: sergei.shtylyov@cogentembedded.com (Sergei Shtylyov) Date: Fri, 14 Feb 2014 17:45:56 +0400 Subject: [PATCH 26/27] ARM: shmobile: lager-reference: Enable CMT0 in device tree In-Reply-To: <1392339605-20691-27-git-send-email-laurent.pinchart+renesas@ideasonboard.com> References: <1392339605-20691-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> <1392339605-20691-27-git-send-email-laurent.pinchart+renesas@ideasonboard.com> Message-ID: <52FE1E14.5090400@cogentembedded.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hello. On 14-02-2014 5:00, 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. WBR, Sergei