diff for duplicates of <1457095043-14115-2-git-send-email-LW@KARO-electronics.de>
diff --git a/a/1.txt b/N1/1.txt
index db70e5a..0782e85 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -5,9 +5,9 @@ The TXUL-0010/-0011 modules are Computers On Module manufactured by
ROM 128MB NAND Flash (TXUL-0010) / 4GB eMMC (TXUL-0011)
Power supply Single 3.3 to 5V
Size 26mm SO-DIMM
- Temp. Range -40°C to 85°C
+ Temp. Range -40?C to 85?C
-Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
+Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>
---
arch/arm/boot/dts/Makefile | 4 +-
arch/arm/boot/dts/imx6ul-tx6ul-0010.dts | 53 ++
@@ -40,7 +40,7 @@ index 0000000..8c2f3df
+++ b/arch/arm/boot/dts/imx6ul-tx6ul-0010.dts
@@ -0,0 +1,53 @@
+/*
-+ * Copyright 2015 Lothar Waßmann <LW@KARO-electronics.de>
++ * Copyright 2015 Lothar Wa?mann <LW@KARO-electronics.de>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
@@ -99,7 +99,7 @@ index 0000000..d82698e
+++ b/arch/arm/boot/dts/imx6ul-tx6ul-0011.dts
@@ -0,0 +1,68 @@
+/*
-+ * Copyright 2015 Lothar Waßmann <LW@KARO-electronics.de>
++ * Copyright 2015 Lothar Wa?mann <LW@KARO-electronics.de>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
@@ -173,7 +173,7 @@ index 0000000..437e9aa
+++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
@@ -0,0 +1,973 @@
+/*
-+ * Copyright 2015 Lothar Waßmann <LW@KARO-electronics.de>
++ * Copyright 2015 Lothar Wa?mann <LW@KARO-electronics.de>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
@@ -294,7 +294,7 @@ index 0000000..437e9aa
+ clock-frequency = <400000>;
+ status = "okay";
+
-+ ds1339: rtc@68 {
++ ds1339: rtc at 68 {
+ compatible = "dallas,ds1339";
+ reg = <0x68>;
+ status = "disabled";
@@ -402,13 +402,13 @@ index 0000000..437e9aa
+ >;
+ status = "disabled";
+
-+ spi@0 {
++ spi at 0 {
+ compatible = "spidev";
+ reg = <0>;
+ spi-max-frequency = <660000>;
+ };
+
-+ spi@1 {
++ spi at 1 {
+ compatible = "spidev";
+ reg = <1>;
+ spi-max-frequency = <660000>;
@@ -466,13 +466,13 @@ index 0000000..437e9aa
+ >;
+ status = "disabled";
+
-+ spidev0: spi@0 {
++ spidev0: spi at 0 {
+ compatible = "spidev";
+ reg = <0>;
+ spi-max-frequency = <60000000>;
+ };
+
-+ spidev1: spi@1 {
++ spidev1: spi at 1 {
+ compatible = "spidev";
+ reg = <1>;
+ spi-max-frequency = <60000000>;
@@ -492,7 +492,7 @@ index 0000000..437e9aa
+ #address-cells = <1>;
+ #size-cells = <0>;
+
-+ etnphy0: ethernet-phy@0 {
++ etnphy0: ethernet-phy at 0 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <0>;
+ pinctrl-names = "default";
@@ -502,7 +502,7 @@ index 0000000..437e9aa
+ status = "okay";
+ };
+
-+ etnphy1: ethernet-phy@2 {
++ etnphy1: ethernet-phy at 2 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <2>;
+ pinctrl-names = "default";
@@ -538,7 +538,7 @@ index 0000000..437e9aa
+ clock-frequency = <400000>;
+ status = "okay";
+
-+ sgtl5000: codec@0a {
++ sgtl5000: codec at 0a {
+ compatible = "fsl,sgtl5000";
+ reg = <0x0a>;
+ #sound-dai-cells = <0>;
@@ -547,7 +547,7 @@ index 0000000..437e9aa
+ clocks = <&mclk>;
+ };
+
-+ polytouch: polytouch@38 {
++ polytouch: polytouch at 38 {
+ compatible = "edt,edt-ft5x06";
+ reg = <0x38>;
+ pinctrl-names = "default";
@@ -559,7 +559,7 @@ index 0000000..437e9aa
+ wakeup-source;
+ };
+
-+ touchscreen: touchscreen@48 {
++ touchscreen: touchscreen at 48 {
+ compatible = "ti,tsc2007";
+ reg = <0x48>;
+ pinctrl-names = "default";
@@ -600,7 +600,7 @@ index 0000000..437e9aa
+ display = <&display>;
+ status = "okay";
+
-+ display: display@di0 {
++ display: display at di0 {
+ bits-per-pixel = <32>;
+ bus-width = <24>;
+ status = "okay";
diff --git a/a/content_digest b/N1/content_digest
index a162225..7f01e3e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001457095043-14115-1-git-send-email-LW\@KARO-electronics.de\0"
]
[
- "From\0Lothar Wa\303\237mann <LW\@karo-electronics.de>\0"
+ "From\0LW\@karo-electronics.de (Lothar Wa\303\237mann)\0"
]
[
"Subject\0[PATCHv3 1/2] ARM: dts: imx6ul: add support for Ka-Ro electronics TXUL modules\0"
@@ -11,25 +11,7 @@
"Date\0Fri, 4 Mar 2016 13:37:22 +0100\0"
]
[
- "To\0Anson Huang <b20788\@freescale.com>",
- " Bai Ping <b51503\@freescale.com>",
- " Frank Li <Frank.Li\@freescale.com>",
- " Fugang Duan <B38611\@freescale.com>",
- " Ian Campbell <ijc+devicetree\@hellion.org.uk>",
- " Kumar Gala <galak\@codeaurora.org>",
- " Lothar Wa\303\237mann <LW\@karo-electronics.de>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Michael Turquette <mturquette\@baylibre.com>",
- " Pawel Moll <pawel.moll\@arm.com>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Russell King <linux\@arm.linux.org.uk>",
- " Sascha Hauer <kernel\@pengutronix.de>",
- " Shawn Guo <shawnguo\@kernel.org>",
- " Stephen Boyd <sboyd\@codeaurora.org>",
- " devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-clk\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -45,9 +27,9 @@
" ROM 128MB NAND Flash (TXUL-0010) / 4GB eMMC (TXUL-0011)\n",
" Power supply Single 3.3 to 5V\n",
" Size 26mm SO-DIMM\n",
- " Temp. Range -40\302\260C to 85\302\260C\n",
+ " Temp. Range -40?C to 85?C\n",
"\n",
- "Signed-off-by: Lothar Wa\303\237mann <LW\@KARO-electronics.de>\n",
+ "Signed-off-by: Lothar Wa?mann <LW\@KARO-electronics.de>\n",
"---\n",
" arch/arm/boot/dts/Makefile | 4 +-\n",
" arch/arm/boot/dts/imx6ul-tx6ul-0010.dts | 53 ++\n",
@@ -80,7 +62,7 @@
"+++ b/arch/arm/boot/dts/imx6ul-tx6ul-0010.dts\n",
"\@\@ -0,0 +1,53 \@\@\n",
"+/*\n",
- "+ * Copyright 2015 Lothar Wa\303\237mann <LW\@KARO-electronics.de>\n",
+ "+ * Copyright 2015 Lothar Wa?mann <LW\@KARO-electronics.de>\n",
"+ *\n",
"+ * This file is dual-licensed: you can use it either under the terms\n",
"+ * of the GPL or the X11 license, at your option. Note that this dual\n",
@@ -139,7 +121,7 @@
"+++ b/arch/arm/boot/dts/imx6ul-tx6ul-0011.dts\n",
"\@\@ -0,0 +1,68 \@\@\n",
"+/*\n",
- "+ * Copyright 2015 Lothar Wa\303\237mann <LW\@KARO-electronics.de>\n",
+ "+ * Copyright 2015 Lothar Wa?mann <LW\@KARO-electronics.de>\n",
"+ *\n",
"+ * This file is dual-licensed: you can use it either under the terms\n",
"+ * of the GPL or the X11 license, at your option. Note that this dual\n",
@@ -213,7 +195,7 @@
"+++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi\n",
"\@\@ -0,0 +1,973 \@\@\n",
"+/*\n",
- "+ * Copyright 2015 Lothar Wa\303\237mann <LW\@KARO-electronics.de>\n",
+ "+ * Copyright 2015 Lothar Wa?mann <LW\@KARO-electronics.de>\n",
"+ *\n",
"+ * This file is dual-licensed: you can use it either under the terms\n",
"+ * of the GPL or the X11 license, at your option. Note that this dual\n",
@@ -334,7 +316,7 @@
"+\t\tclock-frequency = <400000>;\n",
"+\t\tstatus = \"okay\";\n",
"+\n",
- "+\t\tds1339: rtc\@68 {\n",
+ "+\t\tds1339: rtc at 68 {\n",
"+\t\t\tcompatible = \"dallas,ds1339\";\n",
"+\t\t\treg = <0x68>;\n",
"+\t\t\tstatus = \"disabled\";\n",
@@ -442,13 +424,13 @@
"+\t\t>;\n",
"+\t\tstatus = \"disabled\";\n",
"+\n",
- "+\t\tspi\@0 {\n",
+ "+\t\tspi at 0 {\n",
"+\t\t\tcompatible = \"spidev\";\n",
"+\t\t\treg = <0>;\n",
"+\t\t\tspi-max-frequency = <660000>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tspi\@1 {\n",
+ "+\t\tspi at 1 {\n",
"+\t\t\tcompatible = \"spidev\";\n",
"+\t\t\treg = <1>;\n",
"+\t\t\tspi-max-frequency = <660000>;\n",
@@ -506,13 +488,13 @@
"+\t>;\n",
"+\tstatus = \"disabled\";\n",
"+\n",
- "+\tspidev0: spi\@0 {\n",
+ "+\tspidev0: spi at 0 {\n",
"+\t\tcompatible = \"spidev\";\n",
"+\t\treg = <0>;\n",
"+\t\tspi-max-frequency = <60000000>;\n",
"+\t};\n",
"+\n",
- "+\tspidev1: spi\@1 {\n",
+ "+\tspidev1: spi at 1 {\n",
"+\t\tcompatible = \"spidev\";\n",
"+\t\treg = <1>;\n",
"+\t\tspi-max-frequency = <60000000>;\n",
@@ -532,7 +514,7 @@
"+\t\t#address-cells = <1>;\n",
"+\t\t#size-cells = <0>;\n",
"+\n",
- "+\t\tetnphy0: ethernet-phy\@0 {\n",
+ "+\t\tetnphy0: ethernet-phy at 0 {\n",
"+\t\t\tcompatible = \"ethernet-phy-ieee802.3-c22\";\n",
"+\t\t\treg = <0>;\n",
"+\t\t\tpinctrl-names = \"default\";\n",
@@ -542,7 +524,7 @@
"+\t\t\tstatus = \"okay\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tetnphy1: ethernet-phy\@2 {\n",
+ "+\t\tetnphy1: ethernet-phy at 2 {\n",
"+\t\t\tcompatible = \"ethernet-phy-ieee802.3-c22\";\n",
"+\t\t\treg = <2>;\n",
"+\t\t\tpinctrl-names = \"default\";\n",
@@ -578,7 +560,7 @@
"+\tclock-frequency = <400000>;\n",
"+\tstatus = \"okay\";\n",
"+\n",
- "+\tsgtl5000: codec\@0a {\n",
+ "+\tsgtl5000: codec at 0a {\n",
"+\t\tcompatible = \"fsl,sgtl5000\";\n",
"+\t\treg = <0x0a>;\n",
"+\t\t#sound-dai-cells = <0>;\n",
@@ -587,7 +569,7 @@
"+\t\tclocks = <&mclk>;\n",
"+\t};\n",
"+\n",
- "+\tpolytouch: polytouch\@38 {\n",
+ "+\tpolytouch: polytouch at 38 {\n",
"+\t\tcompatible = \"edt,edt-ft5x06\";\n",
"+\t\treg = <0x38>;\n",
"+\t\tpinctrl-names = \"default\";\n",
@@ -599,7 +581,7 @@
"+\t\twakeup-source;\n",
"+\t};\n",
"+\n",
- "+\ttouchscreen: touchscreen\@48 {\n",
+ "+\ttouchscreen: touchscreen at 48 {\n",
"+\t\tcompatible = \"ti,tsc2007\";\n",
"+\t\treg = <0x48>;\n",
"+\t\tpinctrl-names = \"default\";\n",
@@ -640,7 +622,7 @@
"+\tdisplay = <&display>;\n",
"+\tstatus = \"okay\";\n",
"+\n",
- "+\tdisplay: display\@di0 {\n",
+ "+\tdisplay: display at di0 {\n",
"+\t\tbits-per-pixel = <32>;\n",
"+\t\tbus-width = <24>;\n",
"+\t\tstatus = \"okay\";\n",
@@ -1189,4 +1171,4 @@
"2.1.4"
]
-3a0448b6a993de4ad4201ac67d3b4967efa0a2e184d2c6aec8626ebf2a57c4a4
+b47bc6968139ba86669db87345db8442ec3f757c4de5270cdf320189438d6fa2
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.