diff for duplicates of <1386901645-28895-7-git-send-email-ynvich@gmail.com> diff --git a/a/1.txt b/N1/1.txt index da760e4..be2b0a2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -85,7 +85,7 @@ index 0000000..a2a9183 + #address-cells = <1>; + #size-cells = <0>; + -+ vmmc: regulator at 0 { ++ vmmc: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "vmmc"; @@ -95,32 +95,32 @@ index 0000000..a2a9183 + }; + }; + -+ flash at 00000000 { ++ flash@00000000 { + compatible = "cfi-flash"; + reg = <0x0 0x02000000>; + bank-width = <4>; + device-width = <2>; + #address-cells = <1>; + #size-cells = <1>; -+ fs at 0 { ++ fs@0 { + label = "u-boot"; + reg = <0 0x40000>; + }; -+ fs at 40000 { ++ fs@40000 { + label = "settings"; + reg = <0x40000 0x40000>; + }; -+ fs at 80000 { ++ fs@80000 { + label = "kernel"; + reg = <0x80000 0x280000>; + }; -+ fs at 300000 { ++ fs@300000 { + label = "root_fs"; + reg = <0x300000 0x1d00000>; + }; + }; + -+ flash at 04000000 { ++ flash@04000000 { + compatible = "cfi-flash"; + reg = <0x04000000 0x02000000>; + bank-width = <2>; @@ -128,37 +128,37 @@ index 0000000..a2a9183 + }; + + pxabus { -+ pxairq: interrupt-controller at 40d00000 { ++ pxairq: interrupt-controller@40d00000 { + marvell,intc-priority; + marvell,intc-nr-irqs = <34>; + }; + -+ uart at 40100000 { ++ uart@40100000 { + status = "okay"; + }; + -+ uart at 40200000 { ++ uart@40200000 { + status = "okay"; + }; + -+ uart at 40700000 { ++ uart@40700000 { + status = "okay"; + }; + -+ mmc at 41100000 { ++ mmc@41100000 { + status = "okay"; + vmmc-supply = <&vmmc>; + marvell,dma-channels = <21 22>; + }; + -+ ohci at 4c000000 { ++ ohci@4c000000 { + status = "okay"; + marvell,port-mode = <3>; + marvell,oc-mode-perport; + marvell,enable-port1; + }; + -+ eth0: eth at 0c000000 { ++ eth0: eth@0c000000 { + compatible = "davicom,dm9000"; + reg = <0x0c000000 0x2 + 0x0c004000 0x2>; @@ -167,7 +167,7 @@ index 0000000..a2a9183 + status = "okay"; + }; + -+ eth1: eth at 0d000000 { ++ eth1: eth@0d000000 { + compatible = "davicom,dm9000"; + reg = <0x0d000000 0x2 + 0x0d004000 0x2>; diff --git a/a/content_digest b/N1/content_digest index f19b0c1..1b359be 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,23 @@ "ref\01386543229-1542-1-git-send-email-ynvich@gmail.com\0" "ref\01386901645-28895-1-git-send-email-ynvich@gmail.com\0" - "From\0ynvich@gmail.com (Sergei Ianovich)\0" + "From\0Sergei Ianovich <ynvich@gmail.com>\0" "Subject\0[PATCH v2 06/16] ARM: pxa27x: device tree support ICP DAS LP-8x4x\0" "Date\0Fri, 13 Dec 2013 06:27:15 +0400\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-kernel@vger.kernel.org" + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0Sergei Ianovich <ynvich@gmail.com>" + Daniel Mack <zonque@gmail.com> + Arnd Bergmann <arnd@arndb.de> + Linus Walleij <linus.walleij@linaro.org> + Rob Herring <rob.herring@calxeda.com> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Stephen Warren <swarren@wwwdotorg.org> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Russell King <linux@arm.linux.org.uk> + Eric Miao <eric.y.miao@gmail.com> + Haojian Zhuang <haojian.zhuang@gmail.com> + " open list:OPEN FIRMWARE AND... <devicetree@vger.kernel.org>\0" "\00:1\0" "b\0" "ICP DAS calls LP-8x4x 'programmable automation controller'. It is\n" @@ -93,7 +107,7 @@ "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\n" - "+\t\tvmmc: regulator at 0 {\n" + "+\t\tvmmc: regulator@0 {\n" "+\t\t\tcompatible = \"regulator-fixed\";\n" "+\t\t\treg = <0>;\n" "+\t\t\tregulator-name = \"vmmc\";\n" @@ -103,32 +117,32 @@ "+\t\t};\n" "+\t};\n" "+\n" - "+\tflash at 00000000 {\n" + "+\tflash@00000000 {\n" "+\t\tcompatible = \"cfi-flash\";\n" "+\t\treg = <0x0 0x02000000>;\n" "+\t\tbank-width = <4>;\n" "+\t\tdevice-width = <2>;\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <1>;\n" - "+\t\tfs at 0 {\n" + "+\t\tfs@0 {\n" "+\t\t\tlabel = \"u-boot\";\n" "+\t\t\treg = <0 0x40000>;\n" "+\t\t};\n" - "+\t\tfs at 40000 {\n" + "+\t\tfs@40000 {\n" "+\t\t\tlabel = \"settings\";\n" "+\t\t\treg = <0x40000 0x40000>;\n" "+\t\t};\n" - "+\t\tfs at 80000 {\n" + "+\t\tfs@80000 {\n" "+\t\t\tlabel = \"kernel\";\n" "+\t\t\treg = <0x80000 0x280000>;\n" "+\t\t};\n" - "+\t\tfs at 300000 {\n" + "+\t\tfs@300000 {\n" "+\t\t\tlabel = \"root_fs\";\n" "+\t\t\treg = <0x300000 0x1d00000>;\n" "+\t\t};\n" "+\t};\n" "+\n" - "+\tflash at 04000000 {\n" + "+\tflash@04000000 {\n" "+\t\tcompatible = \"cfi-flash\";\n" "+\t\treg = <0x04000000 0x02000000>;\n" "+\t\tbank-width = <2>;\n" @@ -136,37 +150,37 @@ "+\t};\n" "+\n" "+\tpxabus {\n" - "+\t\tpxairq: interrupt-controller at 40d00000 {\n" + "+\t\tpxairq: interrupt-controller@40d00000 {\n" "+\t\t\tmarvell,intc-priority;\n" "+\t\t\tmarvell,intc-nr-irqs = <34>;\n" "+\t\t};\n" "+\n" - "+\t\tuart at 40100000 {\n" + "+\t\tuart@40100000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tuart at 40200000 {\n" + "+\t\tuart@40200000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tuart at 40700000 {\n" + "+\t\tuart@40700000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tmmc at 41100000 {\n" + "+\t\tmmc@41100000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t\tvmmc-supply = <&vmmc>;\n" "+\t\t\tmarvell,dma-channels = <21 22>;\n" "+\t\t};\n" "+\n" - "+\t\tohci at 4c000000 {\n" + "+\t\tohci@4c000000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t\tmarvell,port-mode = <3>;\n" "+\t\t\tmarvell,oc-mode-perport;\n" "+\t\t\tmarvell,enable-port1;\n" "+\t\t};\n" "+\n" - "+\t\teth0: eth at 0c000000 {\n" + "+\t\teth0: eth@0c000000 {\n" "+\t\t\tcompatible = \"davicom,dm9000\";\n" "+\t\t\treg = <0x0c000000 0x2\n" "+\t\t\t 0x0c004000 0x2>;\n" @@ -175,7 +189,7 @@ "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\teth1: eth at 0d000000 {\n" + "+\t\teth1: eth@0d000000 {\n" "+\t\t\tcompatible = \"davicom,dm9000\";\n" "+\t\t\treg = <0x0d000000 0x2\n" "+\t\t\t 0x0d004000 0x2>;\n" @@ -462,4 +476,4 @@ "-- \n" 1.8.4.3 -25a6c18888ad08eaf76f2aa90b0d7fafe8e5bff81c4323e629b35a21956432bb +796b31b140aad296dcf557d7ff5116047bc3632b49c566c941684a88e11674b5
diff --git a/a/1.txt b/N2/1.txt index da760e4..be2b0a2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -85,7 +85,7 @@ index 0000000..a2a9183 + #address-cells = <1>; + #size-cells = <0>; + -+ vmmc: regulator at 0 { ++ vmmc: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "vmmc"; @@ -95,32 +95,32 @@ index 0000000..a2a9183 + }; + }; + -+ flash at 00000000 { ++ flash@00000000 { + compatible = "cfi-flash"; + reg = <0x0 0x02000000>; + bank-width = <4>; + device-width = <2>; + #address-cells = <1>; + #size-cells = <1>; -+ fs at 0 { ++ fs@0 { + label = "u-boot"; + reg = <0 0x40000>; + }; -+ fs at 40000 { ++ fs@40000 { + label = "settings"; + reg = <0x40000 0x40000>; + }; -+ fs at 80000 { ++ fs@80000 { + label = "kernel"; + reg = <0x80000 0x280000>; + }; -+ fs at 300000 { ++ fs@300000 { + label = "root_fs"; + reg = <0x300000 0x1d00000>; + }; + }; + -+ flash at 04000000 { ++ flash@04000000 { + compatible = "cfi-flash"; + reg = <0x04000000 0x02000000>; + bank-width = <2>; @@ -128,37 +128,37 @@ index 0000000..a2a9183 + }; + + pxabus { -+ pxairq: interrupt-controller at 40d00000 { ++ pxairq: interrupt-controller@40d00000 { + marvell,intc-priority; + marvell,intc-nr-irqs = <34>; + }; + -+ uart at 40100000 { ++ uart@40100000 { + status = "okay"; + }; + -+ uart at 40200000 { ++ uart@40200000 { + status = "okay"; + }; + -+ uart at 40700000 { ++ uart@40700000 { + status = "okay"; + }; + -+ mmc at 41100000 { ++ mmc@41100000 { + status = "okay"; + vmmc-supply = <&vmmc>; + marvell,dma-channels = <21 22>; + }; + -+ ohci at 4c000000 { ++ ohci@4c000000 { + status = "okay"; + marvell,port-mode = <3>; + marvell,oc-mode-perport; + marvell,enable-port1; + }; + -+ eth0: eth at 0c000000 { ++ eth0: eth@0c000000 { + compatible = "davicom,dm9000"; + reg = <0x0c000000 0x2 + 0x0c004000 0x2>; @@ -167,7 +167,7 @@ index 0000000..a2a9183 + status = "okay"; + }; + -+ eth1: eth at 0d000000 { ++ eth1: eth@0d000000 { + compatible = "davicom,dm9000"; + reg = <0x0d000000 0x2 + 0x0d004000 0x2>; diff --git a/a/content_digest b/N2/content_digest index f19b0c1..d3e9577 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,23 @@ "ref\01386543229-1542-1-git-send-email-ynvich@gmail.com\0" "ref\01386901645-28895-1-git-send-email-ynvich@gmail.com\0" - "From\0ynvich@gmail.com (Sergei Ianovich)\0" + "From\0Sergei Ianovich <ynvich@gmail.com>\0" "Subject\0[PATCH v2 06/16] ARM: pxa27x: device tree support ICP DAS LP-8x4x\0" "Date\0Fri, 13 Dec 2013 06:27:15 +0400\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-kernel@vger.kernel.org" + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0Sergei Ianovich <ynvich@gmail.com>" + Daniel Mack <zonque@gmail.com> + Arnd Bergmann <arnd@arndb.de> + Linus Walleij <linus.walleij@linaro.org> + Rob Herring <rob.herring@calxeda.com> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Stephen Warren <swarren@wwwdotorg.org> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Russell King <linux@arm.linux.org.uk> + Eric Miao <eric.y.miao@gmail.com> + Haojian Zhuang <haojian.zhuang@gmail.com> + " devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND...)\0" "\00:1\0" "b\0" "ICP DAS calls LP-8x4x 'programmable automation controller'. It is\n" @@ -93,7 +107,7 @@ "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\n" - "+\t\tvmmc: regulator at 0 {\n" + "+\t\tvmmc: regulator@0 {\n" "+\t\t\tcompatible = \"regulator-fixed\";\n" "+\t\t\treg = <0>;\n" "+\t\t\tregulator-name = \"vmmc\";\n" @@ -103,32 +117,32 @@ "+\t\t};\n" "+\t};\n" "+\n" - "+\tflash at 00000000 {\n" + "+\tflash@00000000 {\n" "+\t\tcompatible = \"cfi-flash\";\n" "+\t\treg = <0x0 0x02000000>;\n" "+\t\tbank-width = <4>;\n" "+\t\tdevice-width = <2>;\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <1>;\n" - "+\t\tfs at 0 {\n" + "+\t\tfs@0 {\n" "+\t\t\tlabel = \"u-boot\";\n" "+\t\t\treg = <0 0x40000>;\n" "+\t\t};\n" - "+\t\tfs at 40000 {\n" + "+\t\tfs@40000 {\n" "+\t\t\tlabel = \"settings\";\n" "+\t\t\treg = <0x40000 0x40000>;\n" "+\t\t};\n" - "+\t\tfs at 80000 {\n" + "+\t\tfs@80000 {\n" "+\t\t\tlabel = \"kernel\";\n" "+\t\t\treg = <0x80000 0x280000>;\n" "+\t\t};\n" - "+\t\tfs at 300000 {\n" + "+\t\tfs@300000 {\n" "+\t\t\tlabel = \"root_fs\";\n" "+\t\t\treg = <0x300000 0x1d00000>;\n" "+\t\t};\n" "+\t};\n" "+\n" - "+\tflash at 04000000 {\n" + "+\tflash@04000000 {\n" "+\t\tcompatible = \"cfi-flash\";\n" "+\t\treg = <0x04000000 0x02000000>;\n" "+\t\tbank-width = <2>;\n" @@ -136,37 +150,37 @@ "+\t};\n" "+\n" "+\tpxabus {\n" - "+\t\tpxairq: interrupt-controller at 40d00000 {\n" + "+\t\tpxairq: interrupt-controller@40d00000 {\n" "+\t\t\tmarvell,intc-priority;\n" "+\t\t\tmarvell,intc-nr-irqs = <34>;\n" "+\t\t};\n" "+\n" - "+\t\tuart at 40100000 {\n" + "+\t\tuart@40100000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tuart at 40200000 {\n" + "+\t\tuart@40200000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tuart at 40700000 {\n" + "+\t\tuart@40700000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tmmc at 41100000 {\n" + "+\t\tmmc@41100000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t\tvmmc-supply = <&vmmc>;\n" "+\t\t\tmarvell,dma-channels = <21 22>;\n" "+\t\t};\n" "+\n" - "+\t\tohci at 4c000000 {\n" + "+\t\tohci@4c000000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t\tmarvell,port-mode = <3>;\n" "+\t\t\tmarvell,oc-mode-perport;\n" "+\t\t\tmarvell,enable-port1;\n" "+\t\t};\n" "+\n" - "+\t\teth0: eth at 0c000000 {\n" + "+\t\teth0: eth@0c000000 {\n" "+\t\t\tcompatible = \"davicom,dm9000\";\n" "+\t\t\treg = <0x0c000000 0x2\n" "+\t\t\t 0x0c004000 0x2>;\n" @@ -175,7 +189,7 @@ "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\teth1: eth at 0d000000 {\n" + "+\t\teth1: eth@0d000000 {\n" "+\t\t\tcompatible = \"davicom,dm9000\";\n" "+\t\t\treg = <0x0d000000 0x2\n" "+\t\t\t 0x0d004000 0x2>;\n" @@ -462,4 +476,4 @@ "-- \n" 1.8.4.3 -25a6c18888ad08eaf76f2aa90b0d7fafe8e5bff81c4323e629b35a21956432bb +57957c20e07c71d20baed71d773ca5f1fedc30521ded48d6f5b4d7ca6b1c4f6e
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.