diff for duplicates of <1387309071-22382-9-git-send-email-ynvich@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 3cfba3c..1621b0c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -113,7 +113,7 @@ index 0000000..6a780fe + #address-cells = <1>; + #size-cells = <0>; + -+ vmmc: regulator at 0 { ++ vmmc: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "vmmc"; @@ -124,29 +124,29 @@ index 0000000..6a780fe + }; + + 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>; + }; + -+ ohci at 4c000000 { ++ ohci@4c000000 { + status = "okay"; + marvell,port-mode = <3>; + marvell,oc-mode-perport; @@ -171,7 +171,7 @@ index 0000000..6a780fe + #address-cells = <1>; + #size-cells = <0>; + -+ eeprom at 50 { ++ eeprom@50 { + compatible = "atmel,24c128"; + reg = <0x50>; + pagesize = <64>; @@ -185,46 +185,46 @@ index 0000000..6a780fe + }; + + extbus { -+ flash at 0 { ++ flash@0 { + compatible = "cfi-flash"; + reg = <0 0 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 1 { ++ flash@1 { + compatible = "cfi-flash"; + reg = <1 0x0 0x01000000>; + bank-width = <2>; + device-width = <1>; + }; + -+ netio at 3 { ++ netio@3 { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 3 0 0x02000000>; + interrupt-parent = <&gpio>; + -+ eth0: eth at 0 { ++ eth0: eth@0 { + compatible = "davicom,dm9000"; + reg = <0x0 0x2 + 0x4000 0x2>; @@ -232,7 +232,7 @@ index 0000000..6a780fe + status = "okay"; + }; + -+ eth1: eth at 1000000 { ++ eth1: eth@1000000 { + compatible = "davicom,dm9000"; + reg = <0x1000000 0x2 + 0x1004000 0x2>; diff --git a/a/content_digest b/N1/content_digest index 0b96a53..ce35bf4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,22 @@ "ref\01386901645-28895-1-git-send-email-ynvich@gmail.com\0" "ref\01387309071-22382-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 v3 08/21] ARM: pxa27x: device tree support ICP DAS LP-8x4x\0" "Date\0Tue, 17 Dec 2013 23:37:38 +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> + Rob Herring <rob.herring@calxeda.com> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + 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" @@ -121,7 +134,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" @@ -132,29 +145,29 @@ "+\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};\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" @@ -179,7 +192,7 @@ "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <0>;\n" "+\n" - "+\t\t\teeprom at 50 {\n" + "+\t\t\teeprom@50 {\n" "+\t\t\t\tcompatible = \"atmel,24c128\";\n" "+\t\t\t\treg = <0x50>;\n" "+\t\t\t\tpagesize = <64>;\n" @@ -193,46 +206,46 @@ "+\t};\n" "+\n" "+\textbus {\n" - "+\t\tflash at 0 {\n" + "+\t\tflash@0 {\n" "+\t\t\tcompatible = \"cfi-flash\";\n" "+\t\t\treg = <0 0 0x02000000>;\n" "+\t\t\tbank-width = <4>;\n" "+\t\t\tdevice-width = <2>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" - "+\t\t\tfs at 0 {\n" + "+\t\t\tfs@0 {\n" "+\t\t\t\tlabel = \"u-boot\";\n" "+\t\t\t\treg = <0 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 40000 {\n" + "+\t\t\tfs@40000 {\n" "+\t\t\t\tlabel = \"settings\";\n" "+\t\t\t\treg = <0x40000 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 80000 {\n" + "+\t\t\tfs@80000 {\n" "+\t\t\t\tlabel = \"kernel\";\n" "+\t\t\t\treg = <0x80000 0x280000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 300000 {\n" + "+\t\t\tfs@300000 {\n" "+\t\t\t\tlabel = \"root_fs\";\n" "+\t\t\t\treg = <0x300000 0x1d00000>;\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tflash at 1 {\n" + "+\t\tflash@1 {\n" "+\t\t\tcompatible = \"cfi-flash\";\n" "+\t\t\treg = <1 0x0 0x01000000>;\n" "+\t\t\tbank-width = <2>;\n" "+\t\t\tdevice-width = <1>;\n" "+\t\t};\n" "+\n" - "+\t\tnetio at 3 {\n" + "+\t\tnetio@3 {\n" "+\t\t\tcompatible = \"simple-bus\";\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges = <0 3 0 0x02000000>;\n" "+\t\t\tinterrupt-parent = <&gpio>;\n" "+\n" - "+\t\t\teth0: eth at 0 {\n" + "+\t\t\teth0: eth@0 {\n" "+\t\t\t\tcompatible = \"davicom,dm9000\";\n" "+\t\t\t\treg = <0x0 0x2\n" "+\t\t\t\t 0x4000 0x2>;\n" @@ -240,7 +253,7 @@ "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\teth1: eth at 1000000 {\n" + "+\t\t\teth1: eth@1000000 {\n" "+\t\t\t\tcompatible = \"davicom,dm9000\";\n" "+\t\t\t\treg = <0x1000000 0x2\n" "+\t\t\t\t 0x1004000 0x2>;\n" @@ -561,4 +574,4 @@ "-- \n" 1.8.4.2 -36a4dc399311a8beb9213e84c9bb689b98b67fb0b85a1477e5b701217037efe4 +7e8365e954a5411a47a84a1c306637c1c8fd664e957bb27dab16f9137b678b49
diff --git a/a/1.txt b/N2/1.txt index 3cfba3c..1621b0c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -113,7 +113,7 @@ index 0000000..6a780fe + #address-cells = <1>; + #size-cells = <0>; + -+ vmmc: regulator at 0 { ++ vmmc: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "vmmc"; @@ -124,29 +124,29 @@ index 0000000..6a780fe + }; + + 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>; + }; + -+ ohci at 4c000000 { ++ ohci@4c000000 { + status = "okay"; + marvell,port-mode = <3>; + marvell,oc-mode-perport; @@ -171,7 +171,7 @@ index 0000000..6a780fe + #address-cells = <1>; + #size-cells = <0>; + -+ eeprom at 50 { ++ eeprom@50 { + compatible = "atmel,24c128"; + reg = <0x50>; + pagesize = <64>; @@ -185,46 +185,46 @@ index 0000000..6a780fe + }; + + extbus { -+ flash at 0 { ++ flash@0 { + compatible = "cfi-flash"; + reg = <0 0 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 1 { ++ flash@1 { + compatible = "cfi-flash"; + reg = <1 0x0 0x01000000>; + bank-width = <2>; + device-width = <1>; + }; + -+ netio at 3 { ++ netio@3 { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 3 0 0x02000000>; + interrupt-parent = <&gpio>; + -+ eth0: eth at 0 { ++ eth0: eth@0 { + compatible = "davicom,dm9000"; + reg = <0x0 0x2 + 0x4000 0x2>; @@ -232,7 +232,7 @@ index 0000000..6a780fe + status = "okay"; + }; + -+ eth1: eth at 1000000 { ++ eth1: eth@1000000 { + compatible = "davicom,dm9000"; + reg = <0x1000000 0x2 + 0x1004000 0x2>; diff --git a/a/content_digest b/N2/content_digest index 0b96a53..9950962 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,22 @@ "ref\01386901645-28895-1-git-send-email-ynvich@gmail.com\0" "ref\01387309071-22382-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 v3 08/21] ARM: pxa27x: device tree support ICP DAS LP-8x4x\0" "Date\0Tue, 17 Dec 2013 23:37:38 +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> + Rob Herring <rob.herring@calxeda.com> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + 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" @@ -121,7 +134,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" @@ -132,29 +145,29 @@ "+\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};\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" @@ -179,7 +192,7 @@ "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <0>;\n" "+\n" - "+\t\t\teeprom at 50 {\n" + "+\t\t\teeprom@50 {\n" "+\t\t\t\tcompatible = \"atmel,24c128\";\n" "+\t\t\t\treg = <0x50>;\n" "+\t\t\t\tpagesize = <64>;\n" @@ -193,46 +206,46 @@ "+\t};\n" "+\n" "+\textbus {\n" - "+\t\tflash at 0 {\n" + "+\t\tflash@0 {\n" "+\t\t\tcompatible = \"cfi-flash\";\n" "+\t\t\treg = <0 0 0x02000000>;\n" "+\t\t\tbank-width = <4>;\n" "+\t\t\tdevice-width = <2>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" - "+\t\t\tfs at 0 {\n" + "+\t\t\tfs@0 {\n" "+\t\t\t\tlabel = \"u-boot\";\n" "+\t\t\t\treg = <0 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 40000 {\n" + "+\t\t\tfs@40000 {\n" "+\t\t\t\tlabel = \"settings\";\n" "+\t\t\t\treg = <0x40000 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 80000 {\n" + "+\t\t\tfs@80000 {\n" "+\t\t\t\tlabel = \"kernel\";\n" "+\t\t\t\treg = <0x80000 0x280000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 300000 {\n" + "+\t\t\tfs@300000 {\n" "+\t\t\t\tlabel = \"root_fs\";\n" "+\t\t\t\treg = <0x300000 0x1d00000>;\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tflash at 1 {\n" + "+\t\tflash@1 {\n" "+\t\t\tcompatible = \"cfi-flash\";\n" "+\t\t\treg = <1 0x0 0x01000000>;\n" "+\t\t\tbank-width = <2>;\n" "+\t\t\tdevice-width = <1>;\n" "+\t\t};\n" "+\n" - "+\t\tnetio at 3 {\n" + "+\t\tnetio@3 {\n" "+\t\t\tcompatible = \"simple-bus\";\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges = <0 3 0 0x02000000>;\n" "+\t\t\tinterrupt-parent = <&gpio>;\n" "+\n" - "+\t\t\teth0: eth at 0 {\n" + "+\t\t\teth0: eth@0 {\n" "+\t\t\t\tcompatible = \"davicom,dm9000\";\n" "+\t\t\t\treg = <0x0 0x2\n" "+\t\t\t\t 0x4000 0x2>;\n" @@ -240,7 +253,7 @@ "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\teth1: eth at 1000000 {\n" + "+\t\t\teth1: eth@1000000 {\n" "+\t\t\t\tcompatible = \"davicom,dm9000\";\n" "+\t\t\t\treg = <0x1000000 0x2\n" "+\t\t\t\t 0x1004000 0x2>;\n" @@ -561,4 +574,4 @@ "-- \n" 1.8.4.2 -36a4dc399311a8beb9213e84c9bb689b98b67fb0b85a1477e5b701217037efe4 +4cbd8903427a2c03ac93508c8b6ae7e7cbd32506fb34c2b543c02fe3fd3319cb
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.