diff for duplicates of <51F661DE.1070106@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 1b2f96f..16dd668 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,19 +38,19 @@ Sebastian > + MBUS_ID(0x0d, 0x00) 0 0xf0000000 0x0100000>; /* PMU SRAM 1M */ > + }; > + -> soc at f1000000 { +> soc@f1000000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -44,6 +58,11 @@ > 0xf2100000 0xf2100000 0x0100000 /* PCIe0 I/O 1M */ > 0xf8000000 0xf8000000 0x8000000>; /* BootROM 128M */ > -> + mbusc: mbus-ctrl at 20000 { +> + mbusc: mbus-ctrl@20000 { > + compatible = "marvell,mbus-controller"; > + reg = <0x20000 0x80>, <0x800100 0x8>; > + }; > + -> timer: timer at 20300 { +> timer: timer@20300 { > compatible = "marvell,orion-timer"; > reg = <0x20300 0x20>; > diff --git a/a/content_digest b/N1/content_digest index b11f6fa..8e1cbbd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,15 @@ "ref\01375101114-28858-1-git-send-email-sebastian.hesselbarth@gmail.com\0" "ref\01375101114-28858-4-git-send-email-sebastian.hesselbarth@gmail.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH 3/5] ARM: dove: add MBus DT node\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH 3/5] ARM: dove: add MBus DT node\0" "Date\0Mon, 29 Jul 2013 14:36:46 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Cc\0Russell King <linux@arm.linux.org.uk>" + Jason Cooper <jason@lakedaemon.net> + Andrew Lunn <andrew@lunn.ch> + Ezequiel Garcia <ezequiel.garcia@free-electrons.com> + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On 07/29/2013 02:31 PM, Sebastian Hesselbarth wrote:\n" @@ -46,21 +52,21 @@ "> +\t\t\t MBUS_ID(0x0d, 0x00) 0 0xf0000000 0x0100000>; /* PMU SRAM 1M */\n" "> +\t};\n" "> +\n" - "> \tsoc at f1000000 {\n" + "> \tsoc@f1000000 {\n" "> \t\tcompatible = \"simple-bus\";\n" "> \t\t#address-cells = <1>;\n" "> @@ -44,6 +58,11 @@\n" "> \t\t 0xf2100000 0xf2100000 0x0100000 /* PCIe0 I/O 1M */\n" "> \t\t 0xf8000000 0xf8000000 0x8000000>; /* BootROM 128M */\n" ">\n" - "> +\t\tmbusc: mbus-ctrl at 20000 {\n" + "> +\t\tmbusc: mbus-ctrl@20000 {\n" "> +\t\t\tcompatible = \"marvell,mbus-controller\";\n" "> +\t\t\treg = <0x20000 0x80>, <0x800100 0x8>;\n" "> +\t\t};\n" "> +\n" - "> \t\ttimer: timer at 20300 {\n" + "> \t\ttimer: timer@20300 {\n" "> \t\t\tcompatible = \"marvell,orion-timer\";\n" "> \t\t\treg = <0x20300 0x20>;\n" > -76eeb23f2409e39e59b10e4b7c585e5dd684db51828da9aa72b9b3798db08949 +a24b783a6e89b068f529db2e371d4c2aa539fc9fe6f8e8973eb08bd4f183f104
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.