diff for duplicates of <1464429273-23457-16-git-send-email-krzk@kernel.org>
diff --git a/a/1.txt b/N1/1.txt
index 6efc9ce..879af75 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -33,7 +33,7 @@ index a81a03408a0a..1354b5bbc14e 100644
#clock-cells = <1>;
};
-- mct: mct@101C0000 {
+- mct: mct at 101C0000 {
- compatible = "samsung,exynos4210-mct";
- reg = <0x101C0000 0xB00>;
- interrupt-parent = <&interrupt_map>;
@@ -62,25 +62,25 @@ index a81a03408a0a..1354b5bbc14e 100644
- };
- };
-
-- sysram@02020000 {
+- sysram at 02020000 {
- compatible = "mmio-sram";
- reg = <0x02020000 0x54000>;
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0 0x02020000 0x54000>;
-
-- smp-sysram@0 {
+- smp-sysram at 0 {
- compatible = "samsung,exynos4210-sysram";
- reg = <0x0 0x1000>;
- };
-
-- smp-sysram@53000 {
+- smp-sysram at 53000 {
- compatible = "samsung,exynos4210-sysram-ns";
- reg = <0x53000 0x1000>;
- };
- };
-
- clock: clock-controller@10010000 {
+ clock: clock-controller at 10010000 {
compatible = "samsung,exynos5410-clock";
reg = <0x10010000 0x30000>;
@@ -197,6 +149,11 @@
@@ -114,32 +114,32 @@ index 872dadf0f2d4..ebf2ed3c5ff8 100644
};
};
-- sysram@02020000 {
+- sysram at 02020000 {
- compatible = "mmio-sram";
- reg = <0x02020000 0x54000>;
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0 0x02020000 0x54000>;
-
-- smp-sysram@0 {
+- smp-sysram at 0 {
- compatible = "samsung,exynos4210-sysram";
- reg = <0x0 0x1000>;
- };
-
-- smp-sysram@53000 {
+- smp-sysram at 53000 {
- compatible = "samsung,exynos4210-sysram-ns";
- reg = <0x53000 0x1000>;
- };
- };
-
- clock: clock-controller@10010000 {
+ clock: clock-controller at 10010000 {
compatible = "samsung,exynos5420-clock";
reg = <0x10010000 0x30000>;
@@ -261,34 +242,6 @@
status = "disabled";
};
-- mct: mct@101C0000 {
+- mct: mct at 101C0000 {
- compatible = "samsung,exynos4210-mct";
- reg = <0x101C0000 0xB00>;
- interrupt-parent = <&mct_map>;
@@ -167,7 +167,7 @@ index 872dadf0f2d4..ebf2ed3c5ff8 100644
- };
- };
-
- gsc_pd: power-domain@10044000 {
+ gsc_pd: power-domain at 10044000 {
compatible = "samsung,exynos4210-pd";
reg = <0x10044000 0x20>;
@@ -1163,6 +1116,11 @@
@@ -211,25 +211,25 @@ index 000000000000..1bcfb7f455c1
+ compatible = "samsung,exynos5";
+
+ soc: soc {
-+ sysram@02020000 {
++ sysram at 02020000 {
+ compatible = "mmio-sram";
+ reg = <0x02020000 0x54000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0 0x02020000 0x54000>;
+
-+ smp-sysram@0 {
++ smp-sysram at 0 {
+ compatible = "samsung,exynos4210-sysram";
+ reg = <0x0 0x1000>;
+ };
+
-+ smp-sysram@53000 {
++ smp-sysram at 53000 {
+ compatible = "samsung,exynos4210-sysram-ns";
+ reg = <0x53000 0x1000>;
+ };
+ };
+
-+ mct: mct@101c0000 {
++ mct: mct at 101c0000 {
+ compatible = "samsung,exynos4210-mct";
+ reg = <0x101c0000 0xb00>;
+ interrupt-parent = <&mct_map>;
diff --git a/a/content_digest b/N1/content_digest
index 17df4de..61a91f8 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001464429273-23457-1-git-send-email-krzk\@kernel.org\0"
]
[
- "From\0Krzysztof Kozlowski <krzk\@kernel.org>\0"
+ "From\0krzk\@kernel.org (Krzysztof Kozlowski)\0"
]
[
"Subject\0[PATCH v5 15/22] ARM: dts: exynos: Move common Exynos5410/542x/5800 nodes to new DTSI\0"
@@ -11,22 +11,7 @@
"Date\0Sat, 28 May 2016 11:54:26 +0200\0"
]
[
- "To\0Kukjin Kim <kgene\@kernel.org>",
- " Krzysztof Kozlowski <k.kozlowski\@samsung.com>",
- " Sylwester Nawrocki <s.nawrocki\@samsung.com>",
- " Tomasz Figa <tomasz.figa\@gmail.com>",
- " Michael Turquette <mturquette\@baylibre.com>",
- " Stephen Boyd <sboyd\@codeaurora.org>",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-samsung-soc\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-clk\@vger.kernel.org\0"
-]
-[
- "Cc\0Javier Martinez Canillas <javier\@osg.samsung.com>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Krzysztof Kozlowski <krzk\@kernel.org>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -70,7 +55,7 @@
" \t\t\t#clock-cells = <1>;\n",
" \t\t};\n",
" \n",
- "-\t\tmct: mct\@101C0000 {\n",
+ "-\t\tmct: mct at 101C0000 {\n",
"-\t\t\tcompatible = \"samsung,exynos4210-mct\";\n",
"-\t\t\treg = <0x101C0000 0xB00>;\n",
"-\t\t\tinterrupt-parent = <&interrupt_map>;\n",
@@ -99,25 +84,25 @@
"-\t\t\t};\n",
"-\t\t};\n",
"-\n",
- "-\t\tsysram\@02020000 {\n",
+ "-\t\tsysram at 02020000 {\n",
"-\t\t\tcompatible = \"mmio-sram\";\n",
"-\t\t\treg = <0x02020000 0x54000>;\n",
"-\t\t\t#address-cells = <1>;\n",
"-\t\t\t#size-cells = <1>;\n",
"-\t\t\tranges = <0 0x02020000 0x54000>;\n",
"-\n",
- "-\t\t\tsmp-sysram\@0 {\n",
+ "-\t\t\tsmp-sysram at 0 {\n",
"-\t\t\t\tcompatible = \"samsung,exynos4210-sysram\";\n",
"-\t\t\t\treg = <0x0 0x1000>;\n",
"-\t\t\t};\n",
"-\n",
- "-\t\t\tsmp-sysram\@53000 {\n",
+ "-\t\t\tsmp-sysram at 53000 {\n",
"-\t\t\t\tcompatible = \"samsung,exynos4210-sysram-ns\";\n",
"-\t\t\t\treg = <0x53000 0x1000>;\n",
"-\t\t\t};\n",
"-\t\t};\n",
"-\n",
- " \t\tclock: clock-controller\@10010000 {\n",
+ " \t\tclock: clock-controller at 10010000 {\n",
" \t\t\tcompatible = \"samsung,exynos5410-clock\";\n",
" \t\t\treg = <0x10010000 0x30000>;\n",
"\@\@ -197,6 +149,11 \@\@\n",
@@ -151,32 +136,32 @@
" \t\t\t};\n",
" \t\t};\n",
" \n",
- "-\t\tsysram\@02020000 {\n",
+ "-\t\tsysram at 02020000 {\n",
"-\t\t\tcompatible = \"mmio-sram\";\n",
"-\t\t\treg = <0x02020000 0x54000>;\n",
"-\t\t\t#address-cells = <1>;\n",
"-\t\t\t#size-cells = <1>;\n",
"-\t\t\tranges = <0 0x02020000 0x54000>;\n",
"-\n",
- "-\t\t\tsmp-sysram\@0 {\n",
+ "-\t\t\tsmp-sysram at 0 {\n",
"-\t\t\t\tcompatible = \"samsung,exynos4210-sysram\";\n",
"-\t\t\t\treg = <0x0 0x1000>;\n",
"-\t\t\t};\n",
"-\n",
- "-\t\t\tsmp-sysram\@53000 {\n",
+ "-\t\t\tsmp-sysram at 53000 {\n",
"-\t\t\t\tcompatible = \"samsung,exynos4210-sysram-ns\";\n",
"-\t\t\t\treg = <0x53000 0x1000>;\n",
"-\t\t\t};\n",
"-\t\t};\n",
"-\n",
- " \t\tclock: clock-controller\@10010000 {\n",
+ " \t\tclock: clock-controller at 10010000 {\n",
" \t\t\tcompatible = \"samsung,exynos5420-clock\";\n",
" \t\t\treg = <0x10010000 0x30000>;\n",
"\@\@ -261,34 +242,6 \@\@\n",
" \t\t\tstatus = \"disabled\";\n",
" \t\t};\n",
" \n",
- "-\t\tmct: mct\@101C0000 {\n",
+ "-\t\tmct: mct at 101C0000 {\n",
"-\t\t\tcompatible = \"samsung,exynos4210-mct\";\n",
"-\t\t\treg = <0x101C0000 0xB00>;\n",
"-\t\t\tinterrupt-parent = <&mct_map>;\n",
@@ -204,7 +189,7 @@
"-\t\t\t};\n",
"-\t\t};\n",
"-\n",
- " \t\tgsc_pd: power-domain\@10044000 {\n",
+ " \t\tgsc_pd: power-domain at 10044000 {\n",
" \t\t\tcompatible = \"samsung,exynos4210-pd\";\n",
" \t\t\treg = <0x10044000 0x20>;\n",
"\@\@ -1163,6 +1116,11 \@\@\n",
@@ -248,25 +233,25 @@
"+\tcompatible = \"samsung,exynos5\";\n",
"+\n",
"+\tsoc: soc {\n",
- "+\t\tsysram\@02020000 {\n",
+ "+\t\tsysram at 02020000 {\n",
"+\t\t\tcompatible = \"mmio-sram\";\n",
"+\t\t\treg = <0x02020000 0x54000>;\n",
"+\t\t\t#address-cells = <1>;\n",
"+\t\t\t#size-cells = <1>;\n",
"+\t\t\tranges = <0 0x02020000 0x54000>;\n",
"+\n",
- "+\t\t\tsmp-sysram\@0 {\n",
+ "+\t\t\tsmp-sysram at 0 {\n",
"+\t\t\t\tcompatible = \"samsung,exynos4210-sysram\";\n",
"+\t\t\t\treg = <0x0 0x1000>;\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tsmp-sysram\@53000 {\n",
+ "+\t\t\tsmp-sysram at 53000 {\n",
"+\t\t\t\tcompatible = \"samsung,exynos4210-sysram-ns\";\n",
"+\t\t\t\treg = <0x53000 0x1000>;\n",
"+\t\t\t};\n",
"+\t\t};\n",
"+\n",
- "+\t\tmct: mct\@101c0000 {\n",
+ "+\t\tmct: mct at 101c0000 {\n",
"+\t\t\tcompatible = \"samsung,exynos4210-mct\";\n",
"+\t\t\treg = <0x101c0000 0xb00>;\n",
"+\t\t\tinterrupt-parent = <&mct_map>;\n",
@@ -297,4 +282,4 @@
"2.7.4"
]
-1f3013f56d9d8f134a38bb35995acac578f3aa7e228b1809c293120122d0ee05
+036ffb4d6af49fe54b8987a56c1d6e35cc8d19796c054d0436a4054c9b22ed3e
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.