diff for duplicates of <1422540556-14828-8-git-send-email-mpa@pengutronix.de>
diff --git a/a/1.txt b/N1/1.txt
index 5c19fc0..e5664ac 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -14,10 +14,10 @@ index e4d3aecc4ed2..4780926fa20e 100644
status = "disabled";
};
-- tsc: tsc@50030000 {
+- tsc: tsc at 50030000 {
- compatible = "fsl,imx25-adc", "fsl,imx21-tsc";
- reg = <0x50030000 0x4000>;
-+ tscadc: tscadc@50030000 {
++ tscadc: tscadc at 50030000 {
+ compatible = "fsl,imx25-tsadc";
+ reg = <0x50030000 0xc>;
interrupts = <46>;
@@ -30,7 +30,7 @@ index e4d3aecc4ed2..4780926fa20e 100644
+ ranges;
status = "disabled";
+
-+ adc: adc@50030800 {
++ adc: adc at 50030800 {
+ compatible = "fsl,imx25-gcq";
+ reg = <0x50030800 0x60>;
+ interrupt-parent = <&tscadc>;
@@ -40,7 +40,7 @@ index e4d3aecc4ed2..4780926fa20e 100644
+ status = "disabled";
+ };
+
-+ tsc: tcq@50030400 {
++ tsc: tcq at 50030400 {
+ compatible = "fsl,imx25-tcq";
+ reg = <0x50030400 0x60>;
+ interrupt-parent = <&tscadc>;
@@ -50,6 +50,6 @@ index e4d3aecc4ed2..4780926fa20e 100644
+ };
};
- ssi1: ssi@50034000 {
+ ssi1: ssi at 50034000 {
--
2.1.4
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index a5122ff..e5ccfad 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001422540556-14828-1-git-send-email-mpa\@pengutronix.de\0"
]
[
- "From\0Markus Pargmann <mpa\@pengutronix.de>\0"
+ "From\0mpa\@pengutronix.de (Markus Pargmann)\0"
]
[
"Subject\0[PATCH v6 7/8] ARM: dts: imx25: Add TSC and ADC support\0"
@@ -11,30 +11,7 @@
"Date\0Thu, 29 Jan 2015 15:09:15 +0100\0"
]
[
- "To\0Shawn Guo <shawn.guo\@linaro.org>",
- " Samuel Ortiz <sameo\@linux.intel.com>",
- " Dmitry Torokhov <dmitry.torokhov\@gmail.com>",
- " Jonathan Cameron <jic23\@kernel.org>",
- " Fabio Estevam <festevam\@gmail.com>",
- " Peter Meerwald <pmeerw\@pmeerw.net>",
- " Hartmut Knaack <knaack.h\@gmx.de>\0"
-]
-[
- "Cc\0Denis Carikli <denis\@eukrea.com>",
- " Eric B\303\251nard <eric\@eukrea.com>",
- " Sascha Hauer <kernel\@pengutronix.de>",
- " linux-arm-kernel\@lists.infradead.org",
- " Lee Jones <lee.jones\@linaro.org>",
- " linux-input\@vger.kernel.org",
- " linux-iio\@vger.kernel.org",
- " Lars-Peter Clausen <lars\@metafoo.de>",
- " devicetree\@vger.kernel.org",
- " Rob Herring <robh+dt\@kernel.org>",
- " Pawel Moll <pawel.moll\@arm.com>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Ian Campbell <ijc+devicetree\@hellion.org.uk>",
- " Kumar Gala <galak\@codeaurora.org>",
- " Markus Pargmann <mpa\@pengutronix.de>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -59,10 +36,10 @@
" \t\t\t\tstatus = \"disabled\";\n",
" \t\t\t};\n",
" \n",
- "-\t\t\ttsc: tsc\@50030000 {\n",
+ "-\t\t\ttsc: tsc at 50030000 {\n",
"-\t\t\t\tcompatible = \"fsl,imx25-adc\", \"fsl,imx21-tsc\";\n",
"-\t\t\t\treg = <0x50030000 0x4000>;\n",
- "+\t\t\ttscadc: tscadc\@50030000 {\n",
+ "+\t\t\ttscadc: tscadc at 50030000 {\n",
"+\t\t\t\tcompatible = \"fsl,imx25-tsadc\";\n",
"+\t\t\t\treg = <0x50030000 0xc>;\n",
" \t\t\t\tinterrupts = <46>;\n",
@@ -75,7 +52,7 @@
"+\t\t\t\tranges;\n",
" \t\t\t\tstatus = \"disabled\";\n",
"+\n",
- "+\t\t\t\tadc: adc\@50030800 {\n",
+ "+\t\t\t\tadc: adc at 50030800 {\n",
"+\t\t\t\t\tcompatible = \"fsl,imx25-gcq\";\n",
"+\t\t\t\t\treg = <0x50030800 0x60>;\n",
"+\t\t\t\t\tinterrupt-parent = <&tscadc>;\n",
@@ -85,7 +62,7 @@
"+\t\t\t\t\tstatus = \"disabled\";\n",
"+\t\t\t\t};\n",
"+\n",
- "+\t\t\t\ttsc: tcq\@50030400 {\n",
+ "+\t\t\t\ttsc: tcq at 50030400 {\n",
"+\t\t\t\t\tcompatible = \"fsl,imx25-tcq\";\n",
"+\t\t\t\t\treg = <0x50030400 0x60>;\n",
"+\t\t\t\t\tinterrupt-parent = <&tscadc>;\n",
@@ -95,9 +72,9 @@
"+\t\t\t\t};\n",
" \t\t\t};\n",
" \n",
- " \t\t\tssi1: ssi\@50034000 {\n",
+ " \t\t\tssi1: ssi at 50034000 {\n",
"-- \n",
"2.1.4"
]
-d0e79a814bff1771cd84d107132f779f493ccb1ee9e61f13f4454603883e9234
+1ba1cf66254d0e3be8479aa338d215fed8854bc8100ed05c81be53a9b10c58ab
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.