diff for duplicates of <4380270.nzol65dDjU@avalon> diff --git a/a/1.txt b/N1/1.txt index b039862..0d317ec 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,7 +20,7 @@ On Tuesday 15 July 2014 20:47:41 Simon Horman wrote: > > status = "disabled"; > > }; > > -> > + mtu2: timer@fcff0000 { +> > + mtu2: timer at fcff0000 { > > + compatible = "renesas,mtu2"; > > + reg = <0xfcff0000 0x400>; > > + interrupts = <0 139 IRQ_TYPE_LEVEL_HIGH>; @@ -30,7 +30,7 @@ On Tuesday 15 July 2014 20:47:41 Simon Horman wrote: > > + status = "disabled"; > > + }; > > + -> > scif0: serial@e8007000 { +> > scif0: serial at e8007000 { > > compatible = "renesas,scif-r7s72100", "renesas,scif"; > > reg = <0xe8007000 64>; > @@ -56,7 +56,7 @@ Please do, and sorry for the mistake. > --- a/arch/arm/boot/dts/r7s72100.dtsi > +++ b/arch/arm/boot/dts/r7s72100.dtsi > @@ -232,7 +232,7 @@ -> mtu2: timer@fcff0000 { +> mtu2: timer at fcff0000 { > compatible = "renesas,mtu2"; > reg = <0xfcff0000 0x400>; > - interrupts = <0 139 IRQ_TYPE_LEVEL_HIGH>; diff --git a/a/content_digest b/N1/content_digest index b286e90..2bc5e22 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01404911564-17380-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\01404911564-17380-5-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\020140715114741.GB25333@verge.net.au\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH v5 4/8] ARM: shmobile: r7s72100: Add MTU2 device to DT\0" - "Date\0Tue, 15 Jul 2014 11:55:25 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH v5 4/8] ARM: shmobile: r7s72100: Add MTU2 device to DT\0" + "Date\0Tue, 15 Jul 2014 13:55:25 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -29,7 +29,7 @@ "> > \t\tstatus = \"disabled\";\n" "> > \t};\n" "> > \n" - "> > +\tmtu2: timer@fcff0000 {\n" + "> > +\tmtu2: timer at fcff0000 {\n" "> > +\t\tcompatible = \"renesas,mtu2\";\n" "> > +\t\treg = <0xfcff0000 0x400>;\n" "> > +\t\tinterrupts = <0 139 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -39,7 +39,7 @@ "> > +\t\tstatus = \"disabled\";\n" "> > +\t};\n" "> > +\n" - "> > \tscif0: serial@e8007000 {\n" + "> > \tscif0: serial at e8007000 {\n" "> > \t\tcompatible = \"renesas,scif-r7s72100\", \"renesas,scif\";\n" "> > \t\treg = <0xe8007000 64>;\n" "> \n" @@ -65,7 +65,7 @@ "> --- a/arch/arm/boot/dts/r7s72100.dtsi\n" "> +++ b/arch/arm/boot/dts/r7s72100.dtsi\n" "> @@ -232,7 +232,7 @@\n" - "> \tmtu2: timer@fcff0000 {\n" + "> \tmtu2: timer at fcff0000 {\n" "> \t\tcompatible = \"renesas,mtu2\";\n" "> \t\treg = <0xfcff0000 0x400>;\n" "> -\t\tinterrupts = <0 139 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -79,4 +79,4 @@ "\n" Laurent Pinchart -c105f7fc1b59288f1317d21a4f559e2190114bbef54fc69e5621923e97fe3b23 +8e129a4c992b98b8874d6c79ecb0647a8ba24698fbc5a1611fda4d24d2325866
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.