diff for duplicates of <1374166855-7280-11-git-send-email-gsi@denx.de>
diff --git a/a/content_digest b/N1/content_digest
index af0ee29..c1ebae4 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -28,7 +28,6 @@
" Rob Herring <rob.herring\@calxeda.com>",
" Mark Brown <broonie\@kernel.org>",
" Marc Kleine-Budde <mkl\@pengutronix.de>",
- " Pantelis Antoniou <pantelis.antoniou\@gmail.com>",
" David Woodhouse <dwmw2\@infradead.org>",
" Wolfgang Grandegger <wg\@grandegger.com>",
" Mauro Carvalho Chehab <m.chehab\@samsung.com>\0"
@@ -365,4 +364,4 @@
"1.7.10.4"
]
-6c4289e84c74785459d1093f534905411c9d2ae469336d89ac6df1778cbd6b0d
+89f2fe75f6f235b56da592438f1a8bdd23054246a2db0a7cdec7d64c88ca220f
diff --git a/a/1.txt b/N2/1.txt
index ea8bc56..927fc91 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -32,7 +32,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "mbx-bus", "mbx-3d", "mbx";
};
- sram@30000000 {
+ sram at 30000000 {
@@ -64,6 +68,8 @@
interrupts = <6 8>;
#address-cells = <1>;
@@ -41,7 +41,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "nfc_clk"; /* backwards compat */
};
- localbus@80000020 {
+ localbus at 80000020 {
@@ -153,12 +159,22 @@
compatible = "fsl,mpc5121-mscan";
reg = <0x1300 0x80>;
@@ -53,7 +53,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "ips", "sys", "ref", "mclk";
};
- can@1380 {
+ can at 1380 {
compatible = "fsl,mpc5121-mscan";
reg = <0x1380 0x80>;
interrupts = <13 0x8>;
@@ -64,7 +64,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "ips", "sys", "ref", "mclk";
};
- sdhc@1500 {
+ sdhc at 1500 {
@@ -167,6 +183,9 @@
interrupts = <8 0x8>;
dmas = <&dma0 30>;
@@ -74,7 +74,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "ipg", "per";
};
- i2c@1700 {
+ i2c at 1700 {
@@ -175,6 +194,8 @@
compatible = "fsl,mpc5121-i2c", "fsl-i2c";
reg = <0x1700 0x20>;
@@ -83,7 +83,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "per";
};
- i2c@1720 {
+ i2c at 1720 {
@@ -183,6 +204,8 @@
compatible = "fsl,mpc5121-i2c", "fsl-i2c";
reg = <0x1720 0x20>;
@@ -92,7 +92,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "per";
};
- i2c@1740 {
+ i2c at 1740 {
@@ -191,6 +214,8 @@
compatible = "fsl,mpc5121-i2c", "fsl-i2c";
reg = <0x1740 0x20>;
@@ -101,7 +101,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "per";
};
- i2ccontrol@1760 {
+ i2ccontrol at 1760 {
@@ -202,30 +227,46 @@
compatible = "fsl,mpc5121-axe";
reg = <0x2000 0x100>;
@@ -110,7 +110,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "per";
};
- display@2100 {
+ display at 2100 {
compatible = "fsl,mpc5121-diu";
reg = <0x2100 0x100>;
interrupts = <64 0x8>;
@@ -118,7 +118,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "per";
};
- can@2300 {
+ can at 2300 {
compatible = "fsl,mpc5121-mscan";
reg = <0x2300 0x80>;
interrupts = <90 0x8>;
@@ -129,7 +129,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "ips", "sys", "ref", "mclk";
};
- can@2380 {
+ can at 2380 {
compatible = "fsl,mpc5121-mscan";
reg = <0x2380 0x80>;
interrupts = <91 0x8>;
@@ -140,7 +140,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "ips", "sys", "ref", "mclk";
};
- viu@2400 {
+ viu at 2400 {
compatible = "fsl,mpc5121-viu";
reg = <0x2400 0x400>;
interrupts = <67 0x8>;
@@ -148,7 +148,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "viu_clk"; /* backwards compat */
};
- mdio@2800 {
+ mdio at 2800 {
@@ -233,6 +274,8 @@
reg = <0x2800 0x800>;
#address-cells = <1>;
@@ -157,7 +157,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "per";
};
- eth0: ethernet@2800 {
+ eth0: ethernet at 2800 {
@@ -241,6 +284,8 @@
reg = <0x2800 0x800>;
local-mac-address = [ 00 00 00 00 00 00 ];
@@ -301,7 +301,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "mclk";
};
- pscfifo@11f00 {
+ pscfifo at 11f00 {
compatible = "fsl,mpc5121-psc-fifo";
reg = <0x11f00 0x100>;
interrupts = <40 0x8>;
@@ -309,7 +309,7 @@ index 8f4cba0..983da9c 100644
+ clock-names = "per";
};
- dma0: dma@14000 {
+ dma0: dma at 14000 {
@@ -414,6 +491,8 @@
#address-cells = <3>;
#size-cells = <2>;
diff --git a/a/content_digest b/N2/content_digest
index af0ee29..3a36aee 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -5,7 +5,7 @@
"ref\0001374166855-7280-1-git-send-email-gsi\@denx.de\0"
]
[
- "From\0Gerhard Sittig <gsi\@denx.de>\0"
+ "From\0gsi\@denx.de (Gerhard Sittig)\0"
]
[
"Subject\0[PATCH v2 10/24] dts: mpc512x: add clock specs for client lookups\0"
@@ -14,24 +14,7 @@
"Date\0Thu, 18 Jul 2013 19:00:41 +0200\0"
]
[
- "To\0linuxppc-dev\@lists.ozlabs.org",
- " Anatolij Gustschin <agust\@denx.de>",
- " Mike Turquette <mturquette\@linaro.org>",
- " linux-arm-kernel\@lists.infradead.org",
- " devicetree-discuss\@lists.ozlabs.org\0"
-]
-[
- "Cc\0Detlev Zundel <dzu\@denx.de>",
- " Wolfram Sang <wsa\@the-dreams.de>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " Gerhard Sittig <gsi\@denx.de>",
- " Rob Herring <rob.herring\@calxeda.com>",
- " Mark Brown <broonie\@kernel.org>",
- " Marc Kleine-Budde <mkl\@pengutronix.de>",
- " Pantelis Antoniou <pantelis.antoniou\@gmail.com>",
- " David Woodhouse <dwmw2\@infradead.org>",
- " Wolfgang Grandegger <wg\@grandegger.com>",
- " Mauro Carvalho Chehab <m.chehab\@samsung.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -74,7 +57,7 @@
"+\t\tclock-names = \"mbx-bus\", \"mbx-3d\", \"mbx\";\n",
" \t};\n",
" \n",
- " \tsram\@30000000 {\n",
+ " \tsram at 30000000 {\n",
"\@\@ -64,6 +68,8 \@\@\n",
" \t\tinterrupts = <6 8>;\n",
" \t\t#address-cells = <1>;\n",
@@ -83,7 +66,7 @@
"+\t\tclock-names = \"nfc_clk\";\t/* backwards compat */\n",
" \t};\n",
" \n",
- " \tlocalbus\@80000020 {\n",
+ " \tlocalbus at 80000020 {\n",
"\@\@ -153,12 +159,22 \@\@\n",
" \t\t\tcompatible = \"fsl,mpc5121-mscan\";\n",
" \t\t\treg = <0x1300 0x80>;\n",
@@ -95,7 +78,7 @@
"+\t\t\tclock-names = \"ips\", \"sys\", \"ref\", \"mclk\";\n",
" \t\t};\n",
" \n",
- " \t\tcan\@1380 {\n",
+ " \t\tcan at 1380 {\n",
" \t\t\tcompatible = \"fsl,mpc5121-mscan\";\n",
" \t\t\treg = <0x1380 0x80>;\n",
" \t\t\tinterrupts = <13 0x8>;\n",
@@ -106,7 +89,7 @@
"+\t\t\tclock-names = \"ips\", \"sys\", \"ref\", \"mclk\";\n",
" \t\t};\n",
" \n",
- " \t\tsdhc\@1500 {\n",
+ " \t\tsdhc at 1500 {\n",
"\@\@ -167,6 +183,9 \@\@\n",
" \t\t\tinterrupts = <8 0x8>;\n",
" \t\t\tdmas = <&dma0 30>;\n",
@@ -116,7 +99,7 @@
"+\t\t\tclock-names = \"ipg\", \"per\";\n",
" \t\t};\n",
" \n",
- " \t\ti2c\@1700 {\n",
+ " \t\ti2c at 1700 {\n",
"\@\@ -175,6 +194,8 \@\@\n",
" \t\t\tcompatible = \"fsl,mpc5121-i2c\", \"fsl-i2c\";\n",
" \t\t\treg = <0x1700 0x20>;\n",
@@ -125,7 +108,7 @@
"+\t\t\tclock-names = \"per\";\n",
" \t\t};\n",
" \n",
- " \t\ti2c\@1720 {\n",
+ " \t\ti2c at 1720 {\n",
"\@\@ -183,6 +204,8 \@\@\n",
" \t\t\tcompatible = \"fsl,mpc5121-i2c\", \"fsl-i2c\";\n",
" \t\t\treg = <0x1720 0x20>;\n",
@@ -134,7 +117,7 @@
"+\t\t\tclock-names = \"per\";\n",
" \t\t};\n",
" \n",
- " \t\ti2c\@1740 {\n",
+ " \t\ti2c at 1740 {\n",
"\@\@ -191,6 +214,8 \@\@\n",
" \t\t\tcompatible = \"fsl,mpc5121-i2c\", \"fsl-i2c\";\n",
" \t\t\treg = <0x1740 0x20>;\n",
@@ -143,7 +126,7 @@
"+\t\t\tclock-names = \"per\";\n",
" \t\t};\n",
" \n",
- " \t\ti2ccontrol\@1760 {\n",
+ " \t\ti2ccontrol at 1760 {\n",
"\@\@ -202,30 +227,46 \@\@\n",
" \t\t\tcompatible = \"fsl,mpc5121-axe\";\n",
" \t\t\treg = <0x2000 0x100>;\n",
@@ -152,7 +135,7 @@
"+\t\t\tclock-names = \"per\";\n",
" \t\t};\n",
" \n",
- " \t\tdisplay\@2100 {\n",
+ " \t\tdisplay at 2100 {\n",
" \t\t\tcompatible = \"fsl,mpc5121-diu\";\n",
" \t\t\treg = <0x2100 0x100>;\n",
" \t\t\tinterrupts = <64 0x8>;\n",
@@ -160,7 +143,7 @@
"+\t\t\tclock-names = \"per\";\n",
" \t\t};\n",
" \n",
- " \t\tcan\@2300 {\n",
+ " \t\tcan at 2300 {\n",
" \t\t\tcompatible = \"fsl,mpc5121-mscan\";\n",
" \t\t\treg = <0x2300 0x80>;\n",
" \t\t\tinterrupts = <90 0x8>;\n",
@@ -171,7 +154,7 @@
"+\t\t\tclock-names = \"ips\", \"sys\", \"ref\", \"mclk\";\n",
" \t\t};\n",
" \n",
- " \t\tcan\@2380 {\n",
+ " \t\tcan at 2380 {\n",
" \t\t\tcompatible = \"fsl,mpc5121-mscan\";\n",
" \t\t\treg = <0x2380 0x80>;\n",
" \t\t\tinterrupts = <91 0x8>;\n",
@@ -182,7 +165,7 @@
"+\t\t\tclock-names = \"ips\", \"sys\", \"ref\", \"mclk\";\n",
" \t\t};\n",
" \n",
- " \t\tviu\@2400 {\n",
+ " \t\tviu at 2400 {\n",
" \t\t\tcompatible = \"fsl,mpc5121-viu\";\n",
" \t\t\treg = <0x2400 0x400>;\n",
" \t\t\tinterrupts = <67 0x8>;\n",
@@ -190,7 +173,7 @@
"+\t\t\tclock-names = \"viu_clk\";\t/* backwards compat */\n",
" \t\t};\n",
" \n",
- " \t\tmdio\@2800 {\n",
+ " \t\tmdio at 2800 {\n",
"\@\@ -233,6 +274,8 \@\@\n",
" \t\t\treg = <0x2800 0x800>;\n",
" \t\t\t#address-cells = <1>;\n",
@@ -199,7 +182,7 @@
"+\t\t\tclock-names = \"per\";\n",
" \t\t};\n",
" \n",
- " \t\teth0: ethernet\@2800 {\n",
+ " \t\teth0: ethernet at 2800 {\n",
"\@\@ -241,6 +284,8 \@\@\n",
" \t\t\treg = <0x2800 0x800>;\n",
" \t\t\tlocal-mac-address = [ 00 00 00 00 00 00 ];\n",
@@ -343,7 +326,7 @@
"+\t\t\tclock-names = \"mclk\";\n",
" \t\t};\n",
" \n",
- " \t\tpscfifo\@11f00 {\n",
+ " \t\tpscfifo at 11f00 {\n",
" \t\t\tcompatible = \"fsl,mpc5121-psc-fifo\";\n",
" \t\t\treg = <0x11f00 0x100>;\n",
" \t\t\tinterrupts = <40 0x8>;\n",
@@ -351,7 +334,7 @@
"+\t\t\tclock-names = \"per\";\n",
" \t\t};\n",
" \n",
- " \t\tdma0: dma\@14000 {\n",
+ " \t\tdma0: dma at 14000 {\n",
"\@\@ -414,6 +491,8 \@\@\n",
" \t\t#address-cells = <3>;\n",
" \t\t#size-cells = <2>;\n",
@@ -365,4 +348,4 @@
"1.7.10.4"
]
-6c4289e84c74785459d1093f534905411c9d2ae469336d89ac6df1778cbd6b0d
+aad2562362e1064450793e164f02ffb8f9fd6280b8e3b50f88b65ca702d554c1
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.