diff for duplicates of <7796272.K4ZeEadym2@avalon> diff --git a/a/1.txt b/N1/1.txt index f3de03c..c535fdb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,7 +20,7 @@ On Saturday 14 June 2014 20:54:05 Sergei Shtylyov wrote: > > <1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; > > }; > > -> > + cmt0: timer@ffca0000 { +> > + cmt0: timer at ffca0000 { > > + compatible = "renesas,cmt-48-gen2"; > > + reg = <0 0xffca0000 0 0x1004>; > > + interrupt-parent = <&gic>; @@ -39,7 +39,7 @@ Thank you, I'll fix that. Same for patch 13/19. > > + status = "disabled"; > > + }; > > + -> > + cmt1: timer@e6130000 { +> > + cmt1: timer at e6130000 { > > + compatible = "renesas,cmt-48-gen2"; > > + reg = <0 0xe6130000 0 0x1004>; > > + interrupt-parent = <&gic>; diff --git a/a/content_digest b/N1/content_digest index f3e9f03..bc56e8a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01402763021-4067-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\01402763021-4067-13-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\0539C7E2D.9060807@cogentembedded.com\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH v3 12/19] ARM: shmobile: r8a7790: Add CMT devices to DT\0" - "Date\0Mon, 16 Jun 2014 14:38:47 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH v3 12/19] ARM: shmobile: r8a7790: Add CMT devices to DT\0" + "Date\0Mon, 16 Jun 2014 16:38:47 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -29,7 +29,7 @@ "> > \t\t\t <1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;\n" "> > \t};\n" "> > \n" - "> > +\tcmt0: timer@ffca0000 {\n" + "> > +\tcmt0: timer at ffca0000 {\n" "> > +\t\tcompatible = \"renesas,cmt-48-gen2\";\n" "> > +\t\treg = <0 0xffca0000 0 0x1004>;\n" "> > +\t\tinterrupt-parent = <&gic>;\n" @@ -48,7 +48,7 @@ "> > +\t\tstatus = \"disabled\";\n" "> > +\t};\n" "> > +\n" - "> > +\tcmt1: timer@e6130000 {\n" + "> > +\tcmt1: timer at e6130000 {\n" "> > +\t\tcompatible = \"renesas,cmt-48-gen2\";\n" "> > +\t\treg = <0 0xe6130000 0 0x1004>;\n" "> > +\t\tinterrupt-parent = <&gic>;\n" @@ -60,4 +60,4 @@ "\n" Laurent Pinchart -daa57fbd5bf478daa56a0ae195241b6c91822cd30eb111bf6daa8ca61bb44653 +7854356c116bf9ca2e909349e9cddb1b548626ee9930a6ec2e7cfa1e4230a12c
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.