diff for duplicates of <20110921154939.GF2872@arm.com> diff --git a/a/1.txt b/N1/1.txt index 9f63d98..047220b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,7 +8,7 @@ On Wed, Sep 21, 2011 at 03:33:10PM +0100, Pawel Moll wrote: Done. > > > > + // Timer init is hardcoded in v2m_timer_init(), for now. -> > > > + // timer at 11000 { +> > > > + // timer@11000 { > > > > + // compatible = "arm,arm-sp804"; > > > > > > arm,sp804 is more consistent. I believe the sp804 does have the periphid @@ -32,7 +32,7 @@ Oh, right -- misunderstanding, sorry for that. > > > > + // interrupts = <2>; > > > > + // }; > > > > + -> > > > + // timer at 12000 { +> > > > + // timer@12000 { > > > > + // compatible = "arm,arm-sp804"; > > > > + // reg = <0x12000 0x1000>; > > > > + // }; diff --git a/a/content_digest b/N1/content_digest index b77c844..813409e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,10 +2,15 @@ "ref\04E79E588.6010703@gmail.com\0" "ref\020110921142425.GE2872@arm.com\0" "ref\01316615590.4611.624.camel@hornet.cambridge.arm.com\0" - "From\0dave.martin@linaro.org (Dave Martin)\0" - "Subject\0[PATCH] ARM: vexpress: initial device tree support\0" + "ref\01316615590.4611.624.camel-okZbbLrgpR/YkXV2EHHjLW3o5bpOHsLO@public.gmane.org\0" + "From\0Dave Martin <dave.martin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "Subject\0Re: [PATCH] ARM: vexpress: initial device tree support\0" "Date\0Wed, 21 Sep 2011 16:49:39 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>\0" + "Cc\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org" + patches-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " Rob Herring <rob.herring-CfjtxxwdHycX+EX/Zwu52A@public.gmane.org>\0" "\00:1\0" "b\0" "On Wed, Sep 21, 2011 at 03:33:10PM +0100, Pawel Moll wrote:\n" @@ -18,7 +23,7 @@ "Done.\n" "\n" "> > > > +\t\t\t// Timer init is hardcoded in v2m_timer_init(), for now.\n" - "> > > > +\t\t\t// timer at 11000 {\n" + "> > > > +\t\t\t// timer@11000 {\n" "> > > > +\t\t\t//\tcompatible = \"arm,arm-sp804\";\n" "> > > \n" "> > > arm,sp804 is more consistent. I believe the sp804 does have the periphid\n" @@ -42,7 +47,7 @@ "> > > > +\t\t\t//\tinterrupts = <2>;\n" "> > > > +\t\t\t// };\n" "> > > > +\n" - "> > > > +\t\t\t// timer at 12000 {\n" + "> > > > +\t\t\t// timer@12000 {\n" "> > > > +\t\t\t//\tcompatible = \"arm,arm-sp804\";\n" "> > > > +\t\t\t//\treg = <0x12000 0x1000>;\n" "> > > > +\t\t\t// };\n" @@ -66,4 +71,4 @@ "Cheers\n" ---Dave -720d727ef4c1a97427b4484eee29cb8887dc07afe5338a2fc7c88408bb14bf3b +495c721888ea96d36fbafc24895b5438a79139bbcaa7e69ac2be5e4021c6106c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.