diff for duplicates of <5044D8E5.5010705@ti.com> diff --git a/a/1.txt b/N1/1.txt index b398b90..ddd8bae 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ index 2b670ab..1853dc7 100644 }; }; -+ gic: interrupt-controller@48241000 { ++ gic: interrupt-controller at 48241000 { + compatible = "arm,cortex-a9-gic"; + interrupt-controller; + #interrupt-cells = <3>; @@ -33,7 +33,7 @@ index 2b670ab..1853dc7 100644 + <0x48240100 0x0100>; + }; + - L2: l2-cache-controller@48242000 { + L2: l2-cache-controller at 48242000 { compatible = "arm,pl310-cache"; reg = <0x48242000 0x1000>; @@ -76,30 +84,6 @@ @@ -71,7 +71,7 @@ index 2b670ab..1853dc7 100644 ranges; ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3"; -- gic: interrupt-controller@48241000 { +- gic: interrupt-controller at 48241000 { - compatible = "arm,cortex-a9-gic"; - interrupt-controller; - #interrupt-cells = <3>; @@ -79,7 +79,7 @@ index 2b670ab..1853dc7 100644 - <0x48240100 0x0100>; - }; - - gpio1: gpio@4a310000 { + gpio1: gpio at 4a310000 { compatible = "ti,omap4-gpio"; ti,hwmods = "gpio1"; -- diff --git a/a/content_digest b/N1/content_digest index 093dbf5..5db3ae4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,7 @@ - "From\0Benoit Cousson <b-cousson@ti.com>\0" + "From\0b-cousson@ti.com (Benoit Cousson)\0" "Subject\0[PATCH] ARM: dts: OMAP4: Cleanup and move GIC outside of the OCP node\0" "Date\0Mon, 3 Sep 2012 18:20:53 +0200\0" - "To\0tony@atomide.com <tony@atomide.com>\0" - "Cc\0devicetree-discuss@lists.ozlabs.org <devicetree-discuss@lists.ozlabs.org>" - linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> - " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Remove a useless comment and move GIC controller outside\n" @@ -34,7 +31,7 @@ " \t\t};\n" " \t};\n" " \n" - "+\tgic: interrupt-controller@48241000 {\n" + "+\tgic: interrupt-controller at 48241000 {\n" "+\t\tcompatible = \"arm,cortex-a9-gic\";\n" "+\t\tinterrupt-controller;\n" "+\t\t#interrupt-cells = <3>;\n" @@ -42,7 +39,7 @@ "+\t\t <0x48240100 0x0100>;\n" "+\t};\n" "+\n" - " \tL2: l2-cache-controller@48242000 {\n" + " \tL2: l2-cache-controller at 48242000 {\n" " \t\tcompatible = \"arm,pl310-cache\";\n" " \t\treg = <0x48242000 0x1000>;\n" "@@ -76,30 +84,6 @@\n" @@ -80,7 +77,7 @@ " \t\tranges;\n" " \t\tti,hwmods = \"l3_main_1\", \"l3_main_2\", \"l3_main_3\";\n" " \n" - "-\t\tgic: interrupt-controller@48241000 {\n" + "-\t\tgic: interrupt-controller at 48241000 {\n" "-\t\t\tcompatible = \"arm,cortex-a9-gic\";\n" "-\t\t\tinterrupt-controller;\n" "-\t\t\t#interrupt-cells = <3>;\n" @@ -88,10 +85,10 @@ "-\t\t\t <0x48240100 0x0100>;\n" "-\t\t};\n" "-\n" - " \t\tgpio1: gpio@4a310000 {\n" + " \t\tgpio1: gpio at 4a310000 {\n" " \t\t\tcompatible = \"ti,omap4-gpio\";\n" " \t\t\tti,hwmods = \"gpio1\";\n" "-- \n" 1.7.0.4 -2adb5e1325bd76efedfe2f094893a07b50587abfe2d1a5ce35d95b74d0e48028 +cf9b99b78e6531078cb2d06206fa73c32d53eb84354939609712866e407319e6
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.