diff for duplicates of <20140117111611.GX3471@alberich> diff --git a/a/1.txt b/N1/1.txt index 630d516..11f1429 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,9 +1,9 @@ Add nodes for SMMUs on Calxeda ECX-2000. -Cc: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> -Cc: Andreas Herrmann <herrmann.der.user-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> -Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> -Signed-off-by: Andreas Herrmann <andreas.herrmann-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> +Cc: Rob Herring <robh+dt@kernel.org> +Cc: Andreas Herrmann <herrmann.der.user@googlemail.com> +Acked-by: Rob Herring <robh@kernel.org> +Signed-off-by: Andreas Herrmann <andreas.herrmann@calxeda.com> --- arch/arm/boot/dts/ecx-2000.dts | 44 +++++++++++++++++++++++++++++++++++-- arch/arm/boot/dts/ecx-common.dtsi | 9 +++++--- @@ -32,14 +32,14 @@ index 2ccbb57f..dde23bb 100644 }; }; + -+ soc@9,20000000 { ++ soc at 9,20000000 { + ranges = <0x9 0x20000000 0x9 0x20000000 0x290000>; + #address-cells = <2>; + #size-cells = <1>; + compatible = "simple-bus"; + interrupt-parent = <&intc>; + -+ smmu_mac0: smmu@9,20000000 { ++ smmu_mac0: smmu at 9,20000000 { + compatible = "arm,mmu-400"; + reg = <0x9 0x20000000 0x10000>; + #global-interrupts = <1>; @@ -49,7 +49,7 @@ index 2ccbb57f..dde23bb 100644 + arm,smmu-isolate-devices; + }; + -+ smmu_mac1: smmu@9,20080000 { ++ smmu_mac1: smmu at 9,20080000 { + compatible = "arm,mmu-400"; + reg = <0x9 0x20080000 0x10000>; + #global-interrupts = <1>; @@ -59,7 +59,7 @@ index 2ccbb57f..dde23bb 100644 + arm,smmu-isolate-devices; + }; + -+ smmu_sata: smmu@9,20180000 { ++ smmu_sata: smmu at 9,20180000 { + compatible = "arm,mmu-400"; + reg = <0x9 0x20180000 0x10000>; + mmu-masters = <&sata 0 1 2 3 4 5 6 7 8 9>; @@ -81,8 +81,8 @@ index b90045a..ad9b2fd 100644 compatible = "simple-bus"; interrupt-parent = <&intc>; -- sata@ffe08000 { -+ sata: sata@ffe08000 { +- sata at ffe08000 { ++ sata: sata at ffe08000 { compatible = "calxeda,hb-ahci"; reg = <0xffe08000 0x10000>; interrupts = <0 83 4>; @@ -93,13 +93,13 @@ index b90045a..ad9b2fd 100644 + #stream-id-cells = <10>; }; - sdhci@ffe0e000 { + sdhci at ffe0e000 { @@ -210,18 +211,20 @@ clock-names = "apb_pclk"; }; -- ethernet@fff50000 { -+ mac0: ethernet@fff50000 { +- ethernet at fff50000 { ++ mac0: ethernet at fff50000 { compatible = "calxeda,hb-xgmac"; reg = <0xfff50000 0x1000>; interrupts = <0 77 4 0 78 4 0 79 4>; @@ -107,8 +107,8 @@ index b90045a..ad9b2fd 100644 + #stream-id-cells = <2>; }; -- ethernet@fff51000 { -+ mac1: ethernet@fff51000 { +- ethernet at fff51000 { ++ mac1: ethernet at fff51000 { compatible = "calxeda,hb-xgmac"; reg = <0xfff51000 0x1000>; interrupts = <0 80 4 0 81 4 0 82 4>; @@ -116,6 +116,6 @@ index b90045a..ad9b2fd 100644 + #stream-id-cells = <2>; }; - combophy0: combo-phy@fff58000 { + combophy0: combo-phy at fff58000 { -- 1.7.9.5 diff --git a/a/content_digest b/N1/content_digest index 0edb9e5..87af9a3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,17 @@ "ref\01389876263-25759-1-git-send-email-andreas.herrmann@calxeda.com\0" "ref\01389876263-25759-10-git-send-email-andreas.herrmann@calxeda.com\0" - "ref\01389876263-25759-10-git-send-email-andreas.herrmann-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org\0" - "From\0Andreas Herrmann <andreas.herrmann-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>\0" + "From\0andreas.herrmann@calxeda.com (Andreas Herrmann)\0" "Subject\0[PATCH v2 09/11] ARM: dts: Add nodes for SMMUs on Calxeda ECX-2000\0" "Date\0Fri, 17 Jan 2014 12:16:11 +0100\0" - "To\0Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>\0" - "Cc\0iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org <iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>" - Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add nodes for SMMUs on Calxeda ECX-2000.\n" "\n" - "Cc: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" - "Cc: Andreas Herrmann <herrmann.der.user-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>\n" - "Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" - "Signed-off-by: Andreas Herrmann <andreas.herrmann-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>\n" + "Cc: Rob Herring <robh+dt@kernel.org>\n" + "Cc: Andreas Herrmann <herrmann.der.user@googlemail.com>\n" + "Acked-by: Rob Herring <robh@kernel.org>\n" + "Signed-off-by: Andreas Herrmann <andreas.herrmann@calxeda.com>\n" "---\n" " arch/arm/boot/dts/ecx-2000.dts | 44 +++++++++++++++++++++++++++++++++++--\n" " arch/arm/boot/dts/ecx-common.dtsi | 9 +++++---\n" @@ -44,14 +40,14 @@ " \t\t};\n" " \t};\n" "+\n" - "+\tsoc@9,20000000 {\n" + "+\tsoc at 9,20000000 {\n" "+\t\tranges = <0x9 0x20000000 0x9 0x20000000 0x290000>;\n" "+\t\t#address-cells = <2>;\n" "+\t\t#size-cells = <1>;\n" "+\t\tcompatible = \"simple-bus\";\n" "+\t\tinterrupt-parent = <&intc>;\n" "+\n" - "+\t\tsmmu_mac0: smmu@9,20000000 {\n" + "+\t\tsmmu_mac0: smmu at 9,20000000 {\n" "+\t\t\tcompatible = \"arm,mmu-400\";\n" "+\t\t\treg = <0x9 0x20000000 0x10000>;\n" "+\t\t\t#global-interrupts = <1>;\n" @@ -61,7 +57,7 @@ "+\t\t\tarm,smmu-isolate-devices;\n" "+\t\t};\n" "+\n" - "+\t\tsmmu_mac1: smmu@9,20080000 {\n" + "+\t\tsmmu_mac1: smmu at 9,20080000 {\n" "+\t\t\tcompatible = \"arm,mmu-400\";\n" "+\t\t\treg = <0x9 0x20080000 0x10000>;\n" "+\t\t\t#global-interrupts = <1>;\n" @@ -71,7 +67,7 @@ "+\t\t\tarm,smmu-isolate-devices;\n" "+\t\t};\n" "+\n" - "+\t\tsmmu_sata: smmu@9,20180000 {\n" + "+\t\tsmmu_sata: smmu at 9,20180000 {\n" "+\t\t\tcompatible = \"arm,mmu-400\";\n" "+\t\t\treg = <0x9 0x20180000 0x10000>;\n" "+\t\t\tmmu-masters = <&sata 0 1 2 3 4 5 6 7 8 9>;\n" @@ -93,8 +89,8 @@ " \t\tcompatible = \"simple-bus\";\n" " \t\tinterrupt-parent = <&intc>;\n" " \n" - "-\t\tsata@ffe08000 {\n" - "+\t\tsata: sata@ffe08000 {\n" + "-\t\tsata at ffe08000 {\n" + "+\t\tsata: sata at ffe08000 {\n" " \t\t\tcompatible = \"calxeda,hb-ahci\";\n" " \t\t\treg = <0xffe08000 0x10000>;\n" " \t\t\tinterrupts = <0 83 4>;\n" @@ -105,13 +101,13 @@ "+\t\t\t#stream-id-cells = <10>;\n" " \t\t};\n" " \n" - " \t\tsdhci@ffe0e000 {\n" + " \t\tsdhci at ffe0e000 {\n" "@@ -210,18 +211,20 @@\n" " \t\t\tclock-names = \"apb_pclk\";\n" " \t\t};\n" " \n" - "-\t\tethernet@fff50000 {\n" - "+\t\tmac0: ethernet@fff50000 {\n" + "-\t\tethernet at fff50000 {\n" + "+\t\tmac0: ethernet at fff50000 {\n" " \t\t\tcompatible = \"calxeda,hb-xgmac\";\n" " \t\t\treg = <0xfff50000 0x1000>;\n" " \t\t\tinterrupts = <0 77 4 0 78 4 0 79 4>;\n" @@ -119,8 +115,8 @@ "+\t\t\t#stream-id-cells = <2>;\n" " \t\t};\n" " \n" - "-\t\tethernet@fff51000 {\n" - "+\t\tmac1: ethernet@fff51000 {\n" + "-\t\tethernet at fff51000 {\n" + "+\t\tmac1: ethernet at fff51000 {\n" " \t\t\tcompatible = \"calxeda,hb-xgmac\";\n" " \t\t\treg = <0xfff51000 0x1000>;\n" " \t\t\tinterrupts = <0 80 4 0 81 4 0 82 4>;\n" @@ -128,8 +124,8 @@ "+\t\t\t#stream-id-cells = <2>;\n" " \t\t};\n" " \n" - " \t\tcombophy0: combo-phy@fff58000 {\n" + " \t\tcombophy0: combo-phy at fff58000 {\n" "-- \n" 1.7.9.5 -c55d6e2918fdaa90e94707f7409f155de7c80c6965f90da8938dfbace4e69255 +218adc242a1a6cf6e51c28f2c44ee4599461e6f8a7e8767ae2aafad9360ef249
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.