diff for duplicates of <1402578584-12640-1-git-send-email-LW@KARO-electronics.de>
diff --git a/a/1.txt b/N1/1.txt
index 1805c76..82106ca 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,6 +1,6 @@
Add support for Ka-Ro electronics i.MX51 based TX51 modules
-Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
+Signed-off-by: Lothar Waßmann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/imx51-tx51.dts | 620 ++++++++++++++++++++++++++++++++++++++
@@ -26,7 +26,7 @@ index 0000000..9ae7758
+++ b/arch/arm/boot/dts/imx51-tx51.dts
@@ -0,0 +1,620 @@
+/*
-+ * Copyright 2012-2014 Lothar Waßmann <LW@KARO-electronics.de>
++ * Copyright 2012-2014 Lothar Waßmann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
@@ -646,4 +646,9 @@ index 0000000..9ae7758
+ status = "okay";
+};
--
-1.7.10.4
\ No newline at end of file
+1.7.10.4
+
+--
+To unsubscribe from this list: send the line "unsubscribe devicetree" in
+the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 5ff2d0a..b013909 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,5 +1,5 @@
[
- "From\0Lothar Wa\303\237mann <LW\@karo-electronics.de>\0"
+ "From\0Lothar Wa\303\237mann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh\@public.gmane.org>\0"
]
[
"Subject\0[PATCH] ARM: dts: add support for Ka-Ro TX51\0"
@@ -8,18 +8,18 @@
"Date\0Thu, 12 Jun 2014 15:09:44 +0200\0"
]
[
- "To\0Ian Campbell <ijc+devicetree\@hellion.org.uk>",
- " Kumar Gala <galak\@codeaurora.org>",
- " Mark Rutland <mark.rutland\@arm.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 <shawn.guo\@freescale.com>",
- " devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-kernel\@vger.kernel.org",
- " Lothar Wa\303\237mann <LW\@karo-electronics.de>\0"
+ "To\0Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg\@public.gmane.org>",
+ " Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ\@public.gmane.org>",
+ " Mark Rutland <mark.rutland-5wv7dgnIgG8\@public.gmane.org>",
+ " Pawel Moll <pawel.moll-5wv7dgnIgG8\@public.gmane.org>",
+ " Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
+ " Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ\@public.gmane.org>",
+ " Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ\@public.gmane.org>",
+ " Shawn Guo <shawn.guo-KZfg59tc24xl57MIdRCFDg\@public.gmane.org>",
+ " devicetree-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
+ " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " Lothar Wa\303\237mann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh\@public.gmane.org>\0"
]
[
"\0000:1\0"
@@ -30,7 +30,7 @@
[
"Add support for Ka-Ro electronics i.MX51 based TX51 modules\n",
"\n",
- "Signed-off-by: Lothar Wa\303\237mann <LW\@KARO-electronics.de>\n",
+ "Signed-off-by: Lothar Wa\303\237mann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh\@public.gmane.org>\n",
"---\n",
" arch/arm/boot/dts/Makefile | 1 +\n",
" arch/arm/boot/dts/imx51-tx51.dts | 620 ++++++++++++++++++++++++++++++++++++++\n",
@@ -56,7 +56,7 @@
"+++ b/arch/arm/boot/dts/imx51-tx51.dts\n",
"\@\@ -0,0 +1,620 \@\@\n",
"+/*\n",
- "+ * Copyright 2012-2014 Lothar Wa\303\237mann <LW\@KARO-electronics.de>\n",
+ "+ * Copyright 2012-2014 Lothar Wa\303\237mann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh\@public.gmane.org>\n",
"+ *\n",
"+ * The code contained herein is licensed under the GNU General Public\n",
"+ * License. You may obtain a copy of the GNU General Public License\n",
@@ -676,7 +676,12 @@
"+\tstatus = \"okay\";\n",
"+};\n",
"-- \n",
- "1.7.10.4"
+ "1.7.10.4\n",
+ "\n",
+ "--\n",
+ "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n",
+ "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\n",
+ "More majordomo info at http://vger.kernel.org/majordomo-info.html"
]
-af587e7c3ad2a962eb108250f714d3ac9e789d71b58cc1e45276b6a85ad4945a
+51991f8fc37d779eee1715c871660f902dc4b200fbe659c55153a00f92e2d420
diff --git a/a/1.txt b/N2/1.txt
index 1805c76..9efdfec 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -1,6 +1,6 @@
Add support for Ka-Ro electronics i.MX51 based TX51 modules
-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 | 1 +
arch/arm/boot/dts/imx51-tx51.dts | 620 ++++++++++++++++++++++++++++++++++++++
@@ -26,7 +26,7 @@ index 0000000..9ae7758
+++ b/arch/arm/boot/dts/imx51-tx51.dts
@@ -0,0 +1,620 @@
+/*
-+ * Copyright 2012-2014 Lothar Waßmann <LW@KARO-electronics.de>
++ * Copyright 2012-2014 Lothar Wa?mann <LW@KARO-electronics.de>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
@@ -83,14 +83,14 @@ index 0000000..9ae7758
+ clock-frequency = <0>;
+ };
+
-+ mclk: clock@0 {
++ mclk: clock at 0 {
+ compatible = "fixed-clock";
+ reg = <0>;
+ #clock-cells = <0>;
+ clock-frequency = <27000000>;
+ };
+
-+ clk_26M: clock@1 {
++ clk_26M: clock at 1 {
+ compatible = "fixed-clock";
+ reg = <1>;
+ #clock-cells = <0>;
@@ -99,7 +99,7 @@ index 0000000..9ae7758
+ };
+ };
+
-+ display: display@di0 {
++ display: display at di0 {
+ compatible = "fsl,imx-parallel-display";
+ interface-pix-fmt = "rgb24";
+ pinctrl-names = "default";
@@ -234,7 +234,7 @@ index 0000000..9ae7758
+ &gpio4 16 0>;
+ clock-frequency = <400000>;
+
-+ rtc1: ds1339@68 {
++ rtc1: ds1339 at 68 {
+ compatible = "dallas,ds1339";
+ reg = <0x68>;
+ };
@@ -257,7 +257,7 @@ index 0000000..9ae7758
+ #address-cells = <1>;
+ #size-cells = <0>;
+
-+ reg_2v5: regulator@0 {
++ reg_2v5: regulator at 0 {
+ compatible = "regulator-fixed";
+ reg = <0>;
+ regulator-name = "2V5";
@@ -266,7 +266,7 @@ index 0000000..9ae7758
+ regulator-always-on;
+ };
+
-+ reg_3v3: regulator@1 {
++ reg_3v3: regulator at 1 {
+ compatible = "regulator-fixed";
+ reg = <1>;
+ regulator-name = "3V3";
@@ -275,7 +275,7 @@ index 0000000..9ae7758
+ regulator-always-on;
+ };
+
-+ reg_etn_phy: regulator@2 {
++ reg_etn_phy: regulator at 2 {
+ compatible = "regulator-fixed";
+ reg = <2>;
+ regulator-name = "ETN PHY Power";
@@ -287,7 +287,7 @@ index 0000000..9ae7758
+ regulator-always-on;
+ };
+
-+ reg_lcd_pwr: regulator@5 {
++ reg_lcd_pwr: regulator at 5 {
+ compatible = "regulator-fixed";
+ reg = <5>;
+ regulator-name = "LCD POWER";
@@ -299,7 +299,7 @@ index 0000000..9ae7758
+ regulator-always-on;
+ };
+
-+ reg_lcd_reset: regulator@6 {
++ reg_lcd_reset: regulator at 6 {
+ compatible = "regulator-fixed";
+ reg = <6>;
+ regulator-name = "LCD RESET";
@@ -334,7 +334,7 @@ index 0000000..9ae7758
+ #size-cells = <0>;
+ compatible = "simple-bus";
+
-+ usbh1phy: usbh1phy@0 {
++ usbh1phy: usbh1phy at 0 {
+ compatible = "usb-nop-xceiv";
+ reg = <0>;
+ clocks = <&clk_26M>;
@@ -356,7 +356,7 @@ index 0000000..9ae7758
+ mac-address = [000000000000]; /* will be set by U-Boot */
+ status = "okay";
+
-+ phy0: ethernet-phy@0 {
++ phy0: ethernet-phy at 0 {
+ interrupt-parent = <&gpio3>;
+ interrupts = <18 0>;
+ device_type = "ethernet-phy";
@@ -370,7 +370,7 @@ index 0000000..9ae7758
+&i2c2 {
+ status = "okay";
+
-+ sgtl5000: sgtl5000@0a {
++ sgtl5000: sgtl5000 at 0a {
+ compatible = "fsl,sgtl5000";
+ reg = <0x0a>;
+ clocks = <&mclk>;
@@ -378,7 +378,7 @@ index 0000000..9ae7758
+ VDDIO-supply = <®_3v3>;
+ };
+
-+ polytouch: edt-ft5x06@38 {
++ polytouch: edt-ft5x06 at 38 {
+ compatible = "edt,edt-ft5x06";
+ reg = <0x38>;
+ pinctrl-names = "default";
@@ -389,7 +389,7 @@ index 0000000..9ae7758
+ wake-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>;
+ };
+
-+ touchscreen: tsc2007@48 {
++ touchscreen: tsc2007 at 48 {
+ compatible = "ti,tsc2007";
+ reg = <0x48>;
+ pinctrl-names = "default";
@@ -580,13 +580,13 @@ index 0000000..9ae7758
+ cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW &gpio4 25 GPIO_ACTIVE_LOW>;
+ status = "okay";
+
-+ spidev0: spi@0 {
++ spidev0: spi at 0 {
+ compatible = "spidev";
+ reg = <0>;
+ spi-max-frequency = <54000000>;
+ };
+
-+ spidev1: spi@1 {
++ spidev1: spi at 1 {
+ compatible = "spidev";
+ reg = <1>;
+ spi-max-frequency = <54000000>;
diff --git a/a/content_digest b/N2/content_digest
index 5ff2d0a..6b96c8f 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,5 +1,5 @@
[
- "From\0Lothar Wa\303\237mann <LW\@karo-electronics.de>\0"
+ "From\0LW\@karo-electronics.de (Lothar Wa\303\237mann)\0"
]
[
"Subject\0[PATCH] ARM: dts: add support for Ka-Ro TX51\0"
@@ -8,18 +8,7 @@
"Date\0Thu, 12 Jun 2014 15:09:44 +0200\0"
]
[
- "To\0Ian Campbell <ijc+devicetree\@hellion.org.uk>",
- " Kumar Gala <galak\@codeaurora.org>",
- " Mark Rutland <mark.rutland\@arm.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 <shawn.guo\@freescale.com>",
- " devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-kernel\@vger.kernel.org",
- " Lothar Wa\303\237mann <LW\@karo-electronics.de>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -30,7 +19,7 @@
[
"Add support for Ka-Ro electronics i.MX51 based TX51 modules\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 | 1 +\n",
" arch/arm/boot/dts/imx51-tx51.dts | 620 ++++++++++++++++++++++++++++++++++++++\n",
@@ -56,7 +45,7 @@
"+++ b/arch/arm/boot/dts/imx51-tx51.dts\n",
"\@\@ -0,0 +1,620 \@\@\n",
"+/*\n",
- "+ * Copyright 2012-2014 Lothar Wa\303\237mann <LW\@KARO-electronics.de>\n",
+ "+ * Copyright 2012-2014 Lothar Wa?mann <LW\@KARO-electronics.de>\n",
"+ *\n",
"+ * The code contained herein is licensed under the GNU General Public\n",
"+ * License. You may obtain a copy of the GNU General Public License\n",
@@ -113,14 +102,14 @@
"+\t\t\tclock-frequency = <0>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tmclk: clock\@0 {\n",
+ "+\t\tmclk: clock at 0 {\n",
"+\t\t\tcompatible = \"fixed-clock\";\n",
"+\t\t\treg = <0>;\n",
"+\t\t\t#clock-cells = <0>;\n",
"+\t\t\tclock-frequency = <27000000>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tclk_26M: clock\@1 {\n",
+ "+\t\tclk_26M: clock at 1 {\n",
"+\t\t\tcompatible = \"fixed-clock\";\n",
"+\t\t\treg = <1>;\n",
"+\t\t\t#clock-cells = <0>;\n",
@@ -129,7 +118,7 @@
"+\t\t};\n",
"+\t};\n",
"+\n",
- "+\tdisplay: display\@di0 {\n",
+ "+\tdisplay: display at di0 {\n",
"+\t\tcompatible = \"fsl,imx-parallel-display\";\n",
"+\t\tinterface-pix-fmt = \"rgb24\";\n",
"+\t\tpinctrl-names = \"default\";\n",
@@ -264,7 +253,7 @@
"+\t\t\t &gpio4 16 0>;\n",
"+\t\tclock-frequency = <400000>;\n",
"+\n",
- "+\t\trtc1: ds1339\@68 {\n",
+ "+\t\trtc1: ds1339 at 68 {\n",
"+\t\t\tcompatible = \"dallas,ds1339\";\n",
"+\t\t\treg = <0x68>;\n",
"+\t\t};\n",
@@ -287,7 +276,7 @@
"+\t\t#address-cells = <1>;\n",
"+\t\t#size-cells = <0>;\n",
"+\n",
- "+\t\treg_2v5: regulator\@0 {\n",
+ "+\t\treg_2v5: regulator at 0 {\n",
"+\t\t\tcompatible = \"regulator-fixed\";\n",
"+\t\t\treg = <0>;\n",
"+\t\t\tregulator-name = \"2V5\";\n",
@@ -296,7 +285,7 @@
"+\t\t\tregulator-always-on;\n",
"+\t\t};\n",
"+\n",
- "+\t\treg_3v3: regulator\@1 {\n",
+ "+\t\treg_3v3: regulator at 1 {\n",
"+\t\t\tcompatible = \"regulator-fixed\";\n",
"+\t\t\treg = <1>;\n",
"+\t\t\tregulator-name = \"3V3\";\n",
@@ -305,7 +294,7 @@
"+\t\t\tregulator-always-on;\n",
"+\t\t};\n",
"+\n",
- "+\t\treg_etn_phy: regulator\@2 {\n",
+ "+\t\treg_etn_phy: regulator at 2 {\n",
"+\t\t\tcompatible = \"regulator-fixed\";\n",
"+\t\t\treg = <2>;\n",
"+\t\t\tregulator-name = \"ETN PHY Power\";\n",
@@ -317,7 +306,7 @@
"+\t\t\tregulator-always-on;\n",
"+\t\t};\n",
"+\n",
- "+\t\treg_lcd_pwr: regulator\@5 {\n",
+ "+\t\treg_lcd_pwr: regulator at 5 {\n",
"+\t\t\tcompatible = \"regulator-fixed\";\n",
"+\t\t\treg = <5>;\n",
"+\t\t\tregulator-name = \"LCD POWER\";\n",
@@ -329,7 +318,7 @@
"+\t\t\tregulator-always-on;\n",
"+\t\t};\n",
"+\n",
- "+\t\treg_lcd_reset: regulator\@6 {\n",
+ "+\t\treg_lcd_reset: regulator at 6 {\n",
"+\t\t\tcompatible = \"regulator-fixed\";\n",
"+\t\t\treg = <6>;\n",
"+\t\t\tregulator-name = \"LCD RESET\";\n",
@@ -364,7 +353,7 @@
"+\t\t#size-cells = <0>;\n",
"+\t\tcompatible = \"simple-bus\";\n",
"+\n",
- "+\t\tusbh1phy: usbh1phy\@0 {\n",
+ "+\t\tusbh1phy: usbh1phy at 0 {\n",
"+\t\t\tcompatible = \"usb-nop-xceiv\";\n",
"+\t\t\treg = <0>;\n",
"+\t\t\tclocks = <&clk_26M>;\n",
@@ -386,7 +375,7 @@
"+\tmac-address = [000000000000]; /* will be set by U-Boot */\n",
"+\tstatus = \"okay\";\n",
"+\n",
- "+\tphy0: ethernet-phy\@0 {\n",
+ "+\tphy0: ethernet-phy at 0 {\n",
"+\t\tinterrupt-parent = <&gpio3>;\n",
"+\t\tinterrupts = <18 0>;\n",
"+\t\tdevice_type = \"ethernet-phy\";\n",
@@ -400,7 +389,7 @@
"+&i2c2 {\n",
"+\tstatus = \"okay\";\n",
"+\n",
- "+\tsgtl5000: sgtl5000\@0a {\n",
+ "+\tsgtl5000: sgtl5000 at 0a {\n",
"+\t\tcompatible = \"fsl,sgtl5000\";\n",
"+\t\treg = <0x0a>;\n",
"+\t\tclocks = <&mclk>;\n",
@@ -408,7 +397,7 @@
"+\t\tVDDIO-supply = <®_3v3>;\n",
"+\t};\n",
"+\n",
- "+\tpolytouch: edt-ft5x06\@38 {\n",
+ "+\tpolytouch: edt-ft5x06 at 38 {\n",
"+\t\tcompatible = \"edt,edt-ft5x06\";\n",
"+\t\treg = <0x38>;\n",
"+\t\tpinctrl-names = \"default\";\n",
@@ -419,7 +408,7 @@
"+\t\twake-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>;\n",
"+\t};\n",
"+\n",
- "+\ttouchscreen: tsc2007\@48 {\n",
+ "+\ttouchscreen: tsc2007 at 48 {\n",
"+\t\tcompatible = \"ti,tsc2007\";\n",
"+\t\treg = <0x48>;\n",
"+\t\tpinctrl-names = \"default\";\n",
@@ -610,13 +599,13 @@
"+\tcs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW &gpio4 25 GPIO_ACTIVE_LOW>;\n",
"+\tstatus = \"okay\";\n",
"+\n",
- "+\tspidev0: spi\@0 {\n",
+ "+\tspidev0: spi at 0 {\n",
"+\t\tcompatible = \"spidev\";\n",
"+\t\treg = <0>;\n",
"+\t\tspi-max-frequency = <54000000>;\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 = <54000000>;\n",
@@ -679,4 +668,4 @@
"1.7.10.4"
]
-af587e7c3ad2a962eb108250f714d3ac9e789d71b58cc1e45276b6a85ad4945a
+bf9fc00d6af33030b5e20c65e2fb31583dd547fd16c2ba31c245e68c2d3c6996
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.