diff for duplicates of <5277ABF7.70104@ti.com> diff --git a/a/1.txt b/N1/1.txt index c0bf941..2f96af7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,7 @@ On 11/01/2013 11:16 PM, Nishanth Menon wrote: >> >> + /include/ "am43xx-clocks.dtsi" >> + ->> edma: edma@49000000 { +>> edma: edma at 49000000 { >> compatible = "ti,edma3"; >> ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2"; >> diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi b/arch/arm/boot/dts/am43xx-clocks.dtsi @@ -29,7 +29,7 @@ On 11/01/2013 11:16 PM, Nishanth Menon wrote: >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> + */ ->> +scrm: scrm@44e10000 { +>> +scrm: scrm at 44e10000 { >> + compatible = "ti,scrm"; >> + #address-cells = <1>; >> + #size-cells = <0>; diff --git a/a/content_digest b/N1/content_digest index f119d92..f332e72 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,10 @@ "ref\01382716658-6964-1-git-send-email-t-kristo@ti.com\0" "ref\01382716658-6964-34-git-send-email-t-kristo@ti.com\0" "ref\052741A2C.1000707@ti.com\0" - "From\0Tero Kristo <t-kristo@ti.com>\0" - "Subject\0Re: [PATCHv9 33/43] ARM: dts: am43xx clock data\0" + "From\0t-kristo@ti.com (Tero Kristo)\0" + "Subject\0[PATCHv9 33/43] ARM: dts: am43xx clock data\0" "Date\0Mon, 4 Nov 2013 16:15:19 +0200\0" - "To\0Nishanth Menon <nm@ti.com>" - linux-omap@vger.kernel.org - paul@pwsan.com - tony@atomide.com - bcousson@baylibre.com - rnayak@ti.com - " mturquette@linaro.org\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - " devicetree@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 11/01/2013 11:16 PM, Nishanth Menon wrote:\n" @@ -28,7 +20,7 @@ ">>\n" ">> +\t\t/include/ \"am43xx-clocks.dtsi\"\n" ">> +\n" - ">> \t\tedma: edma@49000000 {\n" + ">> \t\tedma: edma at 49000000 {\n" ">> \t\t\tcompatible = \"ti,edma3\";\n" ">> \t\t\tti,hwmods = \"tpcc\", \"tptc0\", \"tptc1\", \"tptc2\";\n" ">> diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi b/arch/arm/boot/dts/am43xx-clocks.dtsi\n" @@ -46,7 +38,7 @@ ">> + * it under the terms of the GNU General Public License version 2 as\n" ">> + * published by the Free Software Foundation.\n" ">> + */\n" - ">> +scrm: scrm@44e10000 {\n" + ">> +scrm: scrm at 44e10000 {\n" ">> +\tcompatible = \"ti,scrm\";\n" ">> +\t#address-cells = <1>;\n" ">> +\t#size-cells = <0>;\n" @@ -64,4 +56,4 @@ "> [...]\n" > -a0e0cc8bd65d84fa47c77d1681f3b123c3617a7086ba3e8c2e6043a41c4edcf8 +8a35392a88d1fcb2b62873c8b59fde45f889c6ee2c29b4d16794b7cfb9cdbb68
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.