From mboxrd@z Thu Jan 1 00:00:00 1970 From: pawel.moll@arm.com (Pawel Moll) Date: Fri, 14 Sep 2012 13:27:08 +0100 Subject: [PATCH v4 21/24] arm/v2m: initialize arch_timers even if v2m_timer is not present In-Reply-To: <1347621207-11294-21-git-send-email-stefano.stabellini@eu.citrix.com> References: <1347621207-11294-21-git-send-email-stefano.stabellini@eu.citrix.com> Message-ID: <1347625628.2497.65.camel@hornet> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, 2012-09-14 at 12:13 +0100, Stefano Stabellini wrote: > Signed-off-by: Stefano Stabellini > CC: Russell King > CC: Pawel Moll > CC: Marc Zyngier > --- > arch/arm/mach-vexpress/v2m.c | 11 ++++++----- > 1 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c > index 37608f2..4e567f7 100644 > --- a/arch/arm/mach-vexpress/v2m.c > +++ b/arch/arm/mach-vexpress/v2m.c > @@ -621,16 +621,17 @@ static void __init v2m_dt_timer_init(void) > > v2m_clk_init(); > > - err = of_property_read_string(of_aliases, "arm,v2m_timer", &path); > - if (WARN_ON(err)) > - return; > - node = of_find_node_by_path(path); > - v2m_sp804_init(of_iomap(node, 0), irq_of_parse_and_map(node, 0)); > if (arch_timer_of_register() != 0) > twd_local_timer_of_register(); > > if (arch_timer_sched_clock_init() != 0) > versatile_sched_clock_init(v2m_sysreg_base + V2M_SYS_24MHZ, 24000000); > + > + err = of_property_read_string(of_aliases, "arm,v2m_timer", &path); > + if (WARN_ON(err)) > + return; > + node = of_find_node_by_path(path); > + v2m_sp804_init(of_iomap(node, 0), irq_of_parse_and_map(node, 0)); > } > > static struct sys_timer v2m_dt_timer = { Fair point. The alias is going to disappear anyway (I'm working on a VE platform rework right now), but in case I won't get it on time for 3.7, I'll make sure this one is merged instead. Cheers! Pawe? From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751888Ab2INM1Q (ORCPT ); Fri, 14 Sep 2012 08:27:16 -0400 Received: from service87.mimecast.com ([91.220.42.44]:43939 "EHLO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750750Ab2INM1O convert rfc822-to-8bit (ORCPT ); Fri, 14 Sep 2012 08:27:14 -0400 Message-ID: <1347625628.2497.65.camel@hornet> Subject: Re: [PATCH v4 21/24] arm/v2m: initialize arch_timers even if v2m_timer is not present From: Pawel Moll To: Stefano Stabellini Cc: "arnd@arndb.de" , "linux@arm.linux.org.uk" , Catalin Marinas , "linaro-dev@lists.linaro.org" , "linux-arm-kernel@lists.infradead.org" , "tim@xen.org" , "Ian.Campbell@citrix.com" , "konrad.wilk@oracle.com" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Marc Zyngier Date: Fri, 14 Sep 2012 13:27:08 +0100 In-Reply-To: <1347621207-11294-21-git-send-email-stefano.stabellini@eu.citrix.com> References: <1347621207-11294-21-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 X-OriginalArrivalTime: 14 Sep 2012 12:27:08.0448 (UTC) FILETIME=[41FB9200:01CD9274] X-MC-Unique: 112091413271102001 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2012-09-14 at 12:13 +0100, Stefano Stabellini wrote: > Signed-off-by: Stefano Stabellini > CC: Russell King > CC: Pawel Moll > CC: Marc Zyngier > --- > arch/arm/mach-vexpress/v2m.c | 11 ++++++----- > 1 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c > index 37608f2..4e567f7 100644 > --- a/arch/arm/mach-vexpress/v2m.c > +++ b/arch/arm/mach-vexpress/v2m.c > @@ -621,16 +621,17 @@ static void __init v2m_dt_timer_init(void) > > v2m_clk_init(); > > - err = of_property_read_string(of_aliases, "arm,v2m_timer", &path); > - if (WARN_ON(err)) > - return; > - node = of_find_node_by_path(path); > - v2m_sp804_init(of_iomap(node, 0), irq_of_parse_and_map(node, 0)); > if (arch_timer_of_register() != 0) > twd_local_timer_of_register(); > > if (arch_timer_sched_clock_init() != 0) > versatile_sched_clock_init(v2m_sysreg_base + V2M_SYS_24MHZ, 24000000); > + > + err = of_property_read_string(of_aliases, "arm,v2m_timer", &path); > + if (WARN_ON(err)) > + return; > + node = of_find_node_by_path(path); > + v2m_sp804_init(of_iomap(node, 0), irq_of_parse_and_map(node, 0)); > } > > static struct sys_timer v2m_dt_timer = { Fair point. The alias is going to disappear anyway (I'm working on a VE platform rework right now), but in case I won't get it on time for 3.7, I'll make sure this one is merged instead. Cheers! Paweł From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pawel Moll Subject: Re: [PATCH v4 21/24] arm/v2m: initialize arch_timers even if v2m_timer is not present Date: Fri, 14 Sep 2012 13:27:08 +0100 Message-ID: <1347625628.2497.65.camel@hornet> References: <1347621207-11294-21-git-send-email-stefano.stabellini@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1347621207-11294-21-git-send-email-stefano.stabellini-mvvWK6WmYclDPfheJLI6IQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linaro-dev-bounces-cunTk1MwBs8s++Sfvej+rw@public.gmane.org Errors-To: linaro-dev-bounces-cunTk1MwBs8s++Sfvej+rw@public.gmane.org To: Stefano Stabellini Cc: "xen-devel-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org" , "linaro-dev-cunTk1MwBs8s++Sfvej+rw@public.gmane.org" , "Ian.Campbell-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org" , "arnd-r2nGTMty4D4@public.gmane.org" , "konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org" , Marc Zyngier , Catalin Marinas , "tim-LM2mM/qkH7s@public.gmane.org" , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org" , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" List-Id: xen-devel@lists.xenproject.org T24gRnJpLCAyMDEyLTA5LTE0IGF0IDEyOjEzICswMTAwLCBTdGVmYW5vIFN0YWJlbGxpbmkgd3Jv dGU6Cj4gU2lnbmVkLW9mZi1ieTogU3RlZmFubyBTdGFiZWxsaW5pIDxzdGVmYW5vLnN0YWJlbGxp bmlAZXUuY2l0cml4LmNvbT4KPiBDQzogUnVzc2VsbCBLaW5nIDxsaW51eEBhcm0ubGludXgub3Jn LnVrPgo+IENDOiBQYXdlbCBNb2xsIDxwYXdlbC5tb2xsQGFybS5jb20+Cj4gQ0M6IE1hcmMgWnlu Z2llciA8bWFyYy56eW5naWVyQGFybS5jb20+Cj4gLS0tCj4gIGFyY2gvYXJtL21hY2gtdmV4cHJl c3MvdjJtLmMgfCAgIDExICsrKysrKy0tLS0tCj4gIDEgZmlsZXMgY2hhbmdlZCwgNiBpbnNlcnRp b25zKCspLCA1IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9hcmNoL2FybS9tYWNoLXZl eHByZXNzL3YybS5jIGIvYXJjaC9hcm0vbWFjaC12ZXhwcmVzcy92Mm0uYwo+IGluZGV4IDM3NjA4 ZjIuLjRlNTY3ZjcgMTAwNjQ0Cj4gLS0tIGEvYXJjaC9hcm0vbWFjaC12ZXhwcmVzcy92Mm0uYwo+ ICsrKyBiL2FyY2gvYXJtL21hY2gtdmV4cHJlc3MvdjJtLmMKPiBAQCAtNjIxLDE2ICs2MjEsMTcg QEAgc3RhdGljIHZvaWQgX19pbml0IHYybV9kdF90aW1lcl9pbml0KHZvaWQpCj4gIAo+ICAJdjJt X2Nsa19pbml0KCk7Cj4gIAo+IC0JZXJyID0gb2ZfcHJvcGVydHlfcmVhZF9zdHJpbmcob2ZfYWxp YXNlcywgImFybSx2Mm1fdGltZXIiLCAmcGF0aCk7Cj4gLQlpZiAoV0FSTl9PTihlcnIpKQo+IC0J CXJldHVybjsKPiAtCW5vZGUgPSBvZl9maW5kX25vZGVfYnlfcGF0aChwYXRoKTsKPiAtCXYybV9z cDgwNF9pbml0KG9mX2lvbWFwKG5vZGUsIDApLCBpcnFfb2ZfcGFyc2VfYW5kX21hcChub2RlLCAw KSk7Cj4gIAlpZiAoYXJjaF90aW1lcl9vZl9yZWdpc3RlcigpICE9IDApCj4gIAkJdHdkX2xvY2Fs X3RpbWVyX29mX3JlZ2lzdGVyKCk7Cj4gIAo+ICAJaWYgKGFyY2hfdGltZXJfc2NoZWRfY2xvY2tf aW5pdCgpICE9IDApCj4gIAkJdmVyc2F0aWxlX3NjaGVkX2Nsb2NrX2luaXQodjJtX3N5c3JlZ19i YXNlICsgVjJNX1NZU18yNE1IWiwgMjQwMDAwMDApOwo+ICsKPiArCWVyciA9IG9mX3Byb3BlcnR5 X3JlYWRfc3RyaW5nKG9mX2FsaWFzZXMsICJhcm0sdjJtX3RpbWVyIiwgJnBhdGgpOwo+ICsJaWYg KFdBUk5fT04oZXJyKSkKPiArCQlyZXR1cm47Cj4gKwlub2RlID0gb2ZfZmluZF9ub2RlX2J5X3Bh dGgocGF0aCk7Cj4gKwl2Mm1fc3A4MDRfaW5pdChvZl9pb21hcChub2RlLCAwKSwgaXJxX29mX3Bh cnNlX2FuZF9tYXAobm9kZSwgMCkpOwo+ICB9Cj4gIAo+ICBzdGF0aWMgc3RydWN0IHN5c190aW1l ciB2Mm1fZHRfdGltZXIgPSB7CgpGYWlyIHBvaW50LiBUaGUgYWxpYXMgaXMgZ29pbmcgdG8gZGlz YXBwZWFyIGFueXdheSAoSSdtIHdvcmtpbmcgb24gYSBWRQpwbGF0Zm9ybSByZXdvcmsgcmlnaHQg bm93KSwgYnV0IGluIGNhc2UgSSB3b24ndCBnZXQgaXQgb24gdGltZSBmb3IgMy43LApJJ2xsIG1h a2Ugc3VyZSB0aGlzIG9uZSBpcyBtZXJnZWQgaW5zdGVhZC4KCkNoZWVycyEKClBhd2XFggoKCgoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGluYXJvLWRl diBtYWlsaW5nIGxpc3QKbGluYXJvLWRldkBsaXN0cy5saW5hcm8ub3JnCmh0dHA6Ly9saXN0cy5s aW5hcm8ub3JnL21haWxtYW4vbGlzdGluZm8vbGluYXJvLWRldgo=