diff for duplicates of <4F0C495C.4000103@citrix.com> diff --git a/a/1.txt b/N1/1.txt index f70f044..f79594f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,19 +15,19 @@ configurable for this to be workable? > --- /dev/null > +++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts [...] -> + memory at 80000000 { +> + memory@80000000 { > + device_type = "memory"; > + reg = <0x80000000 0x40000000>; > + }; If CONFIG_ARM_ATAG_DTB_COMPAT is enabled the device tree will end up -with two nodes describing the memory ("memory" and "memory at 80000000" in +with two nodes describing the memory ("memory" and "memory@80000000" in this case). >From 22cc6a3410077b99d81e42c4d7f4e29eab6070e3 Mon Sep 17 00:00:00 2001 From: David Vrabel <david.vrabel@citrix.com> Date: Mon, 9 Jan 2012 16:13:19 +0000 -Subject: [PATCH] ARM: vexpress: rename device tree "memory at ..." nodes to +Subject: [PATCH] ARM: vexpress: rename device tree "memory@..." nodes to "memory" If CONFIG_ARM_ATAG_DTB_COMPAT enabled it expects the memory @@ -52,7 +52,7 @@ index 064132e..6667936 100644 }; }; -- memory at 80000000 { +- memory@80000000 { + memory { device_type = "memory"; reg = <0x80000000 0x40000000>; @@ -66,7 +66,7 @@ index 02cada5..0d82ac8 100644 }; }; -- memory at 80000000 { +- memory@80000000 { + memory { device_type = "memory"; reg = <0x80000000 0x40000000>; @@ -80,7 +80,7 @@ index da26a13..e4c3935 100644 }; }; -- memory at 80000000 { +- memory@80000000 { + memory { device_type = "memory"; reg = <0x80000000 0x40000000>; @@ -94,7 +94,7 @@ index 84542e7..d4aa1cc 100644 }; }; -- memory at 60000000 { +- memory@60000000 { + memory { device_type = "memory"; reg = <0x60000000 0x40000000>; diff --git a/a/content_digest b/N1/content_digest index 1664660..7947611 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,11 @@ "ref\01323957761-13553-1-git-send-email-pawel.moll@arm.com\0" "ref\01323957761-13553-10-git-send-email-pawel.moll@arm.com\0" - "From\0david.vrabel@citrix.com (David Vrabel)\0" - "Subject\0[PATCH v6 9/9] ARM: vexpress: Add Device Tree for V2P-CA15 core tile (TC1 variant)\0" + "From\0David Vrabel <david.vrabel@citrix.com>\0" + "Subject\0Re: [PATCH v6 9/9] ARM: vexpress: Add Device Tree for V2P-CA15 core tile (TC1 variant)\0" "Date\0Tue, 10 Jan 2012 14:21:16 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Pawel Moll <pawel.moll@arm.com>\0" + "Cc\0devicetree-discuss@lists.ozlabs.org" + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 15/12/11 14:02, Pawel Moll wrote:\n" @@ -23,19 +25,19 @@ "> --- /dev/null\n" "> +++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts\n" "[...]\n" - "> +\tmemory at 80000000 {\n" + "> +\tmemory@80000000 {\n" "> +\t\tdevice_type = \"memory\";\n" "> +\t\treg = <0x80000000 0x40000000>;\n" "> +\t};\n" "\n" "If CONFIG_ARM_ATAG_DTB_COMPAT is enabled the device tree will end up\n" - "with two nodes describing the memory (\"memory\" and \"memory at 80000000\" in\n" + "with two nodes describing the memory (\"memory\" and \"memory@80000000\" in\n" "this case).\n" "\n" ">From 22cc6a3410077b99d81e42c4d7f4e29eab6070e3 Mon Sep 17 00:00:00 2001\n" "From: David Vrabel <david.vrabel@citrix.com>\n" "Date: Mon, 9 Jan 2012 16:13:19 +0000\n" - "Subject: [PATCH] ARM: vexpress: rename device tree \"memory at ...\" nodes to\n" + "Subject: [PATCH] ARM: vexpress: rename device tree \"memory@...\" nodes to\n" "\"memory\"\n" "\n" "If CONFIG_ARM_ATAG_DTB_COMPAT enabled it expects the memory\n" @@ -60,7 +62,7 @@ " \t\t};\n" " \t};\n" "\n" - "-\tmemory at 80000000 {\n" + "-\tmemory@80000000 {\n" "+\tmemory {\n" " \t\tdevice_type = \"memory\";\n" " \t\treg = <0x80000000 0x40000000>;\n" @@ -74,7 +76,7 @@ " \t\t};\n" " \t};\n" "\n" - "-\tmemory at 80000000 {\n" + "-\tmemory@80000000 {\n" "+\tmemory {\n" " \t\tdevice_type = \"memory\";\n" " \t\treg = <0x80000000 0x40000000>;\n" @@ -88,7 +90,7 @@ " \t\t};\n" " \t};\n" "\n" - "-\tmemory at 80000000 {\n" + "-\tmemory@80000000 {\n" "+\tmemory {\n" " \t\tdevice_type = \"memory\";\n" " \t\treg = <0x80000000 0x40000000>;\n" @@ -102,7 +104,7 @@ " \t\t};\n" " \t};\n" "\n" - "-\tmemory at 60000000 {\n" + "-\tmemory@60000000 {\n" "+\tmemory {\n" " \t\tdevice_type = \"memory\";\n" " \t\treg = <0x60000000 0x40000000>;\n" @@ -112,4 +114,4 @@ "\n" David -8658b90633764782a5dc3bb0f66c70046d0443478701e898fe9058b3f6b2db40 +94be5e060a217df6c67ef0246a53f8967009d8ac4b1c93dbd623d706f29174bc
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.