All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <54F6E789.5080508@atmel.com>

diff --git a/a/1.txt b/N1/1.txt
index e04e499..30aa83b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,7 +1,7 @@
-Le 04/03/2015 03:51, Josh Wu a ?crit :
+Le 04/03/2015 03:51, Josh Wu a écrit :
 > Add at91 sama5d4 xplained board support.
 > 
-> Signed-off-by: Josh Wu <josh.wu@atmel.com>
+> Signed-off-by: Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
 > ---
 > 
 > Changes in v4:
@@ -46,7 +46,7 @@ Le 04/03/2015 03:51, Josh Wu a ?crit :
 > + * at91-sama5d4_xplained.dts - Device Tree file for SAMA5D4 Xplained board
 > + *
 > + *  Copyright (C) 2015 Atmel,
-> + *                2015 Josh Wu <josh.wu@atmel.com>
+> + *                2015 Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
 > + *
 > + * 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
@@ -106,7 +106,7 @@ Le 04/03/2015 03:51, Josh Wu a ?crit :
 > +		#size-cells = <1>;
 > +		ranges;
 > +
-> +		main_clock: clock at 0 {
+> +		main_clock: clock@0 {
 > +			compatible = "atmel,osc", "fixed-clock";
 > +			clock-frequency = <12000000>;
 > +		};
@@ -122,56 +122,56 @@ Le 04/03/2015 03:51, Josh Wu a ?crit :
 > +
 > +	ahb {
 > +		apb {
-> +			spi0: spi at f8010000 {
+> +			spi0: spi@f8010000 {
 > +				cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
 > +				status = "okay";
-> +				m25p80 at 0 {
+> +				m25p80@0 {
 > +					compatible = "atmel,at25df321a";
 > +					spi-max-frequency = <50000000>;
 > +					reg = <0>;
 > +				};
 > +			};
 > +
-> +			macb0: ethernet at f8020000 {
+> +			macb0: ethernet@f8020000 {
 > +				phy-mode = "rmii";
 > +				status = "okay";
 > +
-> +				phy0: ethernet-phy at 1 {
+> +				phy0: ethernet-phy@1 {
 > +					interrupt-parent = <&pioE>;
 > +					interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
 > +					reg = <1>;
 > +				};
 > +			};
 > +
-> +			mmc1: mmc at fc000000 {
+> +			mmc1: mmc@fc000000 {
 > +				pinctrl-names = "default";
 > +				pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>;
 > +				status = "okay";
-> +				slot at 0 {
+> +				slot@0 {
 > +					reg = <0>;
 > +					bus-width = <4>;
 > +					cd-gpios = <&pioE 3 0>;
 > +				};
 > +			};
 > +
-> +			usart3: serial at fc00c000 {
+> +			usart3: serial@fc00c000 {
 > +				status = "okay";
 > +			};
 > +
-> +			usart4: serial at fc010000 {
+> +			usart4: serial@fc010000 {
 > +				status = "okay";
 > +			};
 > +
-> +			adc0: adc at fc034000 {
+> +			adc0: adc@fc034000 {
 > +				atmel,adc-vref = <3300>;
 > +				status = "okay";
 > +			};
 > +
-> +			watchdog at fc068640 {
+> +			watchdog@fc068640 {
 > +				status = "okay";
 > +			};
 > +
-> +			pinctrl at fc06a000 {
+> +			pinctrl@fc06a000 {
 > +				board {
 > +					pinctrl_mmc1_cd: mmc1_cd {
 > +						atmel,pins =
@@ -194,14 +194,14 @@ Nit: useless comment which is wrong. I remove it.
 > +			};
 > +		};
 > +
-> +		usb0: gadget at 00400000 {
+> +		usb0: gadget@00400000 {
 > +			atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>;
 > +			pinctrl-names = "default";
 > +			pinctrl-0 = <&pinctrl_usba_vbus>;
 > +			status = "okay";
 > +		};
 > +
-> +		usb1: ohci at 00500000 {
+> +		usb1: ohci@00500000 {
 > +			num-ports = <3>;
 > +			atmel,vbus-gpio = <0
 > +					   &pioE 11 GPIO_ACTIVE_HIGH
@@ -210,43 +210,43 @@ Nit: useless comment which is wrong. I remove it.
 > +			status = "okay";
 > +		};
 > +
-> +		usb2: ehci at 00600000 {
+> +		usb2: ehci@00600000 {
 > +			status = "okay";
 > +		};
 > +
-> +		nand0: nand at 80000000 {
+> +		nand0: nand@80000000 {
 > +			nand-bus-width = <8>;
 > +			nand-ecc-mode = "hw";
 > +			nand-on-flash-bbt;
 > +			atmel,has-pmecc;
 > +			status = "okay";
 > +
-> +			at91bootstrap at 0 {
+> +			at91bootstrap@0 {
 > +				label = "at91bootstrap";
 > +				reg = <0x0 0x40000>;
 > +			};
 > +
-> +			bootloader at 40000 {
+> +			bootloader@40000 {
 > +				label = "bootloader";
 > +				reg = <0x40000 0x80000>;
 > +			};
 > +
-> +			bootloaderenv at c0000 {
+> +			bootloaderenv@c0000 {
 > +				label = "bootloader env";
 > +				reg = <0xc0000 0xc0000>;
 > +			};
 > +
-> +			dtb at 180000 {
+> +			dtb@180000 {
 > +				label = "device tree";
 > +				reg = <0x180000 0x80000>;
 > +			};
 > +
-> +			kernel at 200000 {
+> +			kernel@200000 {
 > +				label = "kernel";
 > +				reg = <0x200000 0x600000>;
 > +			};
 > +
-> +			rootfs at 800000 {
+> +			rootfs@800000 {
 > +				label = "rootfs";
 > +				reg = <0x800000 0x0f800000>;
 > +			};
@@ -289,10 +289,14 @@ Nit: useless comment which is wrong. I remove it.
 > 
 
 Otherwise, it's okay:
-Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
+Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
 
 I take it for at91-4.1-dt (no need to respin it).
 
 Bye,
 -- 
 Nicolas Ferre
+--
+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
diff --git a/a/content_digest b/N1/content_digest
index 357fd9f..a0f1445 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,15 +1,30 @@
  "ref\01425437508-30976-1-git-send-email-josh.wu@atmel.com\0"
  "ref\01425437508-30976-2-git-send-email-josh.wu@atmel.com\0"
- "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0"
- "Subject\0[PATCH v4 2/2] ARM: at91: dts: sama5d4: add dts for sama5d4 xplained board\0"
+ "ref\01425437508-30976-2-git-send-email-josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org\0"
+ "From\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0"
+ "Subject\0Re: [PATCH v4 2/2] ARM: at91: dts: sama5d4: add dts for sama5d4 xplained board\0"
  "Date\0Wed, 4 Mar 2015 12:07:53 +0100\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0"
+ "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org"
+  Boris Brezillon <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
+  Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
+  Bo Shen <voice.shen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
+  Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
+  Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>
+  Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>
+  Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>
+  Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
+  Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
+  Andrew Victor <linux-PelNFVqkFnVyf+4FbqDuWQ@public.gmane.org>
+  Jean-Christophe Plagniol-Villard <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>
+  devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+ " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0"
  "\00:1\0"
  "b\0"
- "Le 04/03/2015 03:51, Josh Wu a ?crit :\n"
+ "Le 04/03/2015 03:51, Josh Wu a \303\251crit :\n"
  "> Add at91 sama5d4 xplained board support.\n"
  "> \n"
- "> Signed-off-by: Josh Wu <josh.wu@atmel.com>\n"
+ "> Signed-off-by: Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n"
  "> ---\n"
  "> \n"
  "> Changes in v4:\n"
@@ -54,7 +69,7 @@
  "> + * at91-sama5d4_xplained.dts - Device Tree file for SAMA5D4 Xplained board\n"
  "> + *\n"
  "> + *  Copyright (C) 2015 Atmel,\n"
- "> + *                2015 Josh Wu <josh.wu@atmel.com>\n"
+ "> + *                2015 Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\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"
@@ -114,7 +129,7 @@
  "> +\t\t#size-cells = <1>;\n"
  "> +\t\tranges;\n"
  "> +\n"
- "> +\t\tmain_clock: clock at 0 {\n"
+ "> +\t\tmain_clock: clock@0 {\n"
  "> +\t\t\tcompatible = \"atmel,osc\", \"fixed-clock\";\n"
  "> +\t\t\tclock-frequency = <12000000>;\n"
  "> +\t\t};\n"
@@ -130,56 +145,56 @@
  "> +\n"
  "> +\tahb {\n"
  "> +\t\tapb {\n"
- "> +\t\t\tspi0: spi at f8010000 {\n"
+ "> +\t\t\tspi0: spi@f8010000 {\n"
  "> +\t\t\t\tcs-gpios = <&pioC 3 0>, <0>, <0>, <0>;\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
- "> +\t\t\t\tm25p80 at 0 {\n"
+ "> +\t\t\t\tm25p80@0 {\n"
  "> +\t\t\t\t\tcompatible = \"atmel,at25df321a\";\n"
  "> +\t\t\t\t\tspi-max-frequency = <50000000>;\n"
  "> +\t\t\t\t\treg = <0>;\n"
  "> +\t\t\t\t};\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tmacb0: ethernet at f8020000 {\n"
+ "> +\t\t\tmacb0: ethernet@f8020000 {\n"
  "> +\t\t\t\tphy-mode = \"rmii\";\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\n"
- "> +\t\t\t\tphy0: ethernet-phy at 1 {\n"
+ "> +\t\t\t\tphy0: ethernet-phy@1 {\n"
  "> +\t\t\t\t\tinterrupt-parent = <&pioE>;\n"
  "> +\t\t\t\t\tinterrupts = <1 IRQ_TYPE_EDGE_FALLING>;\n"
  "> +\t\t\t\t\treg = <1>;\n"
  "> +\t\t\t\t};\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tmmc1: mmc at fc000000 {\n"
+ "> +\t\t\tmmc1: mmc@fc000000 {\n"
  "> +\t\t\t\tpinctrl-names = \"default\";\n"
  "> +\t\t\t\tpinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>;\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
- "> +\t\t\t\tslot at 0 {\n"
+ "> +\t\t\t\tslot@0 {\n"
  "> +\t\t\t\t\treg = <0>;\n"
  "> +\t\t\t\t\tbus-width = <4>;\n"
  "> +\t\t\t\t\tcd-gpios = <&pioE 3 0>;\n"
  "> +\t\t\t\t};\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tusart3: serial at fc00c000 {\n"
+ "> +\t\t\tusart3: serial@fc00c000 {\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tusart4: serial at fc010000 {\n"
+ "> +\t\t\tusart4: serial@fc010000 {\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tadc0: adc at fc034000 {\n"
+ "> +\t\t\tadc0: adc@fc034000 {\n"
  "> +\t\t\t\tatmel,adc-vref = <3300>;\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\twatchdog at fc068640 {\n"
+ "> +\t\t\twatchdog@fc068640 {\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tpinctrl at fc06a000 {\n"
+ "> +\t\t\tpinctrl@fc06a000 {\n"
  "> +\t\t\t\tboard {\n"
  "> +\t\t\t\t\tpinctrl_mmc1_cd: mmc1_cd {\n"
  "> +\t\t\t\t\t\tatmel,pins =\n"
@@ -202,14 +217,14 @@
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tusb0: gadget at 00400000 {\n"
+ "> +\t\tusb0: gadget@00400000 {\n"
  "> +\t\t\tatmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>;\n"
  "> +\t\t\tpinctrl-names = \"default\";\n"
  "> +\t\t\tpinctrl-0 = <&pinctrl_usba_vbus>;\n"
  "> +\t\t\tstatus = \"okay\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tusb1: ohci at 00500000 {\n"
+ "> +\t\tusb1: ohci@00500000 {\n"
  "> +\t\t\tnum-ports = <3>;\n"
  "> +\t\t\tatmel,vbus-gpio = <0\n"
  "> +\t\t\t\t\t   &pioE 11 GPIO_ACTIVE_HIGH\n"
@@ -218,43 +233,43 @@
  "> +\t\t\tstatus = \"okay\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tusb2: ehci at 00600000 {\n"
+ "> +\t\tusb2: ehci@00600000 {\n"
  "> +\t\t\tstatus = \"okay\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tnand0: nand at 80000000 {\n"
+ "> +\t\tnand0: nand@80000000 {\n"
  "> +\t\t\tnand-bus-width = <8>;\n"
  "> +\t\t\tnand-ecc-mode = \"hw\";\n"
  "> +\t\t\tnand-on-flash-bbt;\n"
  "> +\t\t\tatmel,has-pmecc;\n"
  "> +\t\t\tstatus = \"okay\";\n"
  "> +\n"
- "> +\t\t\tat91bootstrap at 0 {\n"
+ "> +\t\t\tat91bootstrap@0 {\n"
  "> +\t\t\t\tlabel = \"at91bootstrap\";\n"
  "> +\t\t\t\treg = <0x0 0x40000>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tbootloader at 40000 {\n"
+ "> +\t\t\tbootloader@40000 {\n"
  "> +\t\t\t\tlabel = \"bootloader\";\n"
  "> +\t\t\t\treg = <0x40000 0x80000>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tbootloaderenv at c0000 {\n"
+ "> +\t\t\tbootloaderenv@c0000 {\n"
  "> +\t\t\t\tlabel = \"bootloader env\";\n"
  "> +\t\t\t\treg = <0xc0000 0xc0000>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tdtb at 180000 {\n"
+ "> +\t\t\tdtb@180000 {\n"
  "> +\t\t\t\tlabel = \"device tree\";\n"
  "> +\t\t\t\treg = <0x180000 0x80000>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tkernel at 200000 {\n"
+ "> +\t\t\tkernel@200000 {\n"
  "> +\t\t\t\tlabel = \"kernel\";\n"
  "> +\t\t\t\treg = <0x200000 0x600000>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\trootfs at 800000 {\n"
+ "> +\t\t\trootfs@800000 {\n"
  "> +\t\t\t\tlabel = \"rootfs\";\n"
  "> +\t\t\t\treg = <0x800000 0x0f800000>;\n"
  "> +\t\t\t};\n"
@@ -297,12 +312,16 @@
  "> \n"
  "\n"
  "Otherwise, it's okay:\n"
- "Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>\n"
+ "Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n"
  "\n"
  "I take it for at91-4.1-dt (no need to respin it).\n"
  "\n"
  "Bye,\n"
  "-- \n"
- Nicolas Ferre
+ "Nicolas Ferre\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
 
-ad120bac43ea798694a088bf8621d78e9d22bed18767e7580b9ac15e1e7c977f
+f3b203557efe174de8fe9dcee189704559a318b876b2a1a52aadfae248048e79

diff --git a/a/1.txt b/N2/1.txt
index e04e499..73c8444 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -1,4 +1,4 @@
-Le 04/03/2015 03:51, Josh Wu a ?crit :
+Le 04/03/2015 03:51, Josh Wu a écrit :
 > Add at91 sama5d4 xplained board support.
 > 
 > Signed-off-by: Josh Wu <josh.wu@atmel.com>
@@ -106,7 +106,7 @@ Le 04/03/2015 03:51, Josh Wu a ?crit :
 > +		#size-cells = <1>;
 > +		ranges;
 > +
-> +		main_clock: clock at 0 {
+> +		main_clock: clock@0 {
 > +			compatible = "atmel,osc", "fixed-clock";
 > +			clock-frequency = <12000000>;
 > +		};
@@ -122,56 +122,56 @@ Le 04/03/2015 03:51, Josh Wu a ?crit :
 > +
 > +	ahb {
 > +		apb {
-> +			spi0: spi at f8010000 {
+> +			spi0: spi@f8010000 {
 > +				cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
 > +				status = "okay";
-> +				m25p80 at 0 {
+> +				m25p80@0 {
 > +					compatible = "atmel,at25df321a";
 > +					spi-max-frequency = <50000000>;
 > +					reg = <0>;
 > +				};
 > +			};
 > +
-> +			macb0: ethernet at f8020000 {
+> +			macb0: ethernet@f8020000 {
 > +				phy-mode = "rmii";
 > +				status = "okay";
 > +
-> +				phy0: ethernet-phy at 1 {
+> +				phy0: ethernet-phy@1 {
 > +					interrupt-parent = <&pioE>;
 > +					interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
 > +					reg = <1>;
 > +				};
 > +			};
 > +
-> +			mmc1: mmc at fc000000 {
+> +			mmc1: mmc@fc000000 {
 > +				pinctrl-names = "default";
 > +				pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>;
 > +				status = "okay";
-> +				slot at 0 {
+> +				slot@0 {
 > +					reg = <0>;
 > +					bus-width = <4>;
 > +					cd-gpios = <&pioE 3 0>;
 > +				};
 > +			};
 > +
-> +			usart3: serial at fc00c000 {
+> +			usart3: serial@fc00c000 {
 > +				status = "okay";
 > +			};
 > +
-> +			usart4: serial at fc010000 {
+> +			usart4: serial@fc010000 {
 > +				status = "okay";
 > +			};
 > +
-> +			adc0: adc at fc034000 {
+> +			adc0: adc@fc034000 {
 > +				atmel,adc-vref = <3300>;
 > +				status = "okay";
 > +			};
 > +
-> +			watchdog at fc068640 {
+> +			watchdog@fc068640 {
 > +				status = "okay";
 > +			};
 > +
-> +			pinctrl at fc06a000 {
+> +			pinctrl@fc06a000 {
 > +				board {
 > +					pinctrl_mmc1_cd: mmc1_cd {
 > +						atmel,pins =
@@ -194,14 +194,14 @@ Nit: useless comment which is wrong. I remove it.
 > +			};
 > +		};
 > +
-> +		usb0: gadget at 00400000 {
+> +		usb0: gadget@00400000 {
 > +			atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>;
 > +			pinctrl-names = "default";
 > +			pinctrl-0 = <&pinctrl_usba_vbus>;
 > +			status = "okay";
 > +		};
 > +
-> +		usb1: ohci at 00500000 {
+> +		usb1: ohci@00500000 {
 > +			num-ports = <3>;
 > +			atmel,vbus-gpio = <0
 > +					   &pioE 11 GPIO_ACTIVE_HIGH
@@ -210,43 +210,43 @@ Nit: useless comment which is wrong. I remove it.
 > +			status = "okay";
 > +		};
 > +
-> +		usb2: ehci at 00600000 {
+> +		usb2: ehci@00600000 {
 > +			status = "okay";
 > +		};
 > +
-> +		nand0: nand at 80000000 {
+> +		nand0: nand@80000000 {
 > +			nand-bus-width = <8>;
 > +			nand-ecc-mode = "hw";
 > +			nand-on-flash-bbt;
 > +			atmel,has-pmecc;
 > +			status = "okay";
 > +
-> +			at91bootstrap at 0 {
+> +			at91bootstrap@0 {
 > +				label = "at91bootstrap";
 > +				reg = <0x0 0x40000>;
 > +			};
 > +
-> +			bootloader at 40000 {
+> +			bootloader@40000 {
 > +				label = "bootloader";
 > +				reg = <0x40000 0x80000>;
 > +			};
 > +
-> +			bootloaderenv at c0000 {
+> +			bootloaderenv@c0000 {
 > +				label = "bootloader env";
 > +				reg = <0xc0000 0xc0000>;
 > +			};
 > +
-> +			dtb at 180000 {
+> +			dtb@180000 {
 > +				label = "device tree";
 > +				reg = <0x180000 0x80000>;
 > +			};
 > +
-> +			kernel at 200000 {
+> +			kernel@200000 {
 > +				label = "kernel";
 > +				reg = <0x200000 0x600000>;
 > +			};
 > +
-> +			rootfs at 800000 {
+> +			rootfs@800000 {
 > +				label = "rootfs";
 > +				reg = <0x800000 0x0f800000>;
 > +			};
diff --git a/a/content_digest b/N2/content_digest
index 357fd9f..926fcee 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,12 +1,26 @@
  "ref\01425437508-30976-1-git-send-email-josh.wu@atmel.com\0"
  "ref\01425437508-30976-2-git-send-email-josh.wu@atmel.com\0"
- "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0"
- "Subject\0[PATCH v4 2/2] ARM: at91: dts: sama5d4: add dts for sama5d4 xplained board\0"
+ "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0"
+ "Subject\0Re: [PATCH v4 2/2] ARM: at91: dts: sama5d4: add dts for sama5d4 xplained board\0"
  "Date\0Wed, 4 Mar 2015 12:07:53 +0100\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Josh Wu <josh.wu@atmel.com>\0"
+ "Cc\0<linux-arm-kernel@lists.infradead.org>"
+  Boris Brezillon <boris.brezillon@free-electrons.com>
+  Alexandre Belloni <alexandre.belloni@free-electrons.com>
+  Bo Shen <voice.shen@atmel.com>
+  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>
+  Russell King <linux@arm.linux.org.uk>
+  Andrew Victor <linux@maxim.org.za>
+  Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
+  <devicetree@vger.kernel.org>
+ " <linux-kernel@vger.kernel.org>\0"
  "\00:1\0"
  "b\0"
- "Le 04/03/2015 03:51, Josh Wu a ?crit :\n"
+ "Le 04/03/2015 03:51, Josh Wu a \303\251crit :\n"
  "> Add at91 sama5d4 xplained board support.\n"
  "> \n"
  "> Signed-off-by: Josh Wu <josh.wu@atmel.com>\n"
@@ -114,7 +128,7 @@
  "> +\t\t#size-cells = <1>;\n"
  "> +\t\tranges;\n"
  "> +\n"
- "> +\t\tmain_clock: clock at 0 {\n"
+ "> +\t\tmain_clock: clock@0 {\n"
  "> +\t\t\tcompatible = \"atmel,osc\", \"fixed-clock\";\n"
  "> +\t\t\tclock-frequency = <12000000>;\n"
  "> +\t\t};\n"
@@ -130,56 +144,56 @@
  "> +\n"
  "> +\tahb {\n"
  "> +\t\tapb {\n"
- "> +\t\t\tspi0: spi at f8010000 {\n"
+ "> +\t\t\tspi0: spi@f8010000 {\n"
  "> +\t\t\t\tcs-gpios = <&pioC 3 0>, <0>, <0>, <0>;\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
- "> +\t\t\t\tm25p80 at 0 {\n"
+ "> +\t\t\t\tm25p80@0 {\n"
  "> +\t\t\t\t\tcompatible = \"atmel,at25df321a\";\n"
  "> +\t\t\t\t\tspi-max-frequency = <50000000>;\n"
  "> +\t\t\t\t\treg = <0>;\n"
  "> +\t\t\t\t};\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tmacb0: ethernet at f8020000 {\n"
+ "> +\t\t\tmacb0: ethernet@f8020000 {\n"
  "> +\t\t\t\tphy-mode = \"rmii\";\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\n"
- "> +\t\t\t\tphy0: ethernet-phy at 1 {\n"
+ "> +\t\t\t\tphy0: ethernet-phy@1 {\n"
  "> +\t\t\t\t\tinterrupt-parent = <&pioE>;\n"
  "> +\t\t\t\t\tinterrupts = <1 IRQ_TYPE_EDGE_FALLING>;\n"
  "> +\t\t\t\t\treg = <1>;\n"
  "> +\t\t\t\t};\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tmmc1: mmc at fc000000 {\n"
+ "> +\t\t\tmmc1: mmc@fc000000 {\n"
  "> +\t\t\t\tpinctrl-names = \"default\";\n"
  "> +\t\t\t\tpinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>;\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
- "> +\t\t\t\tslot at 0 {\n"
+ "> +\t\t\t\tslot@0 {\n"
  "> +\t\t\t\t\treg = <0>;\n"
  "> +\t\t\t\t\tbus-width = <4>;\n"
  "> +\t\t\t\t\tcd-gpios = <&pioE 3 0>;\n"
  "> +\t\t\t\t};\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tusart3: serial at fc00c000 {\n"
+ "> +\t\t\tusart3: serial@fc00c000 {\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tusart4: serial at fc010000 {\n"
+ "> +\t\t\tusart4: serial@fc010000 {\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tadc0: adc at fc034000 {\n"
+ "> +\t\t\tadc0: adc@fc034000 {\n"
  "> +\t\t\t\tatmel,adc-vref = <3300>;\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\twatchdog at fc068640 {\n"
+ "> +\t\t\twatchdog@fc068640 {\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tpinctrl at fc06a000 {\n"
+ "> +\t\t\tpinctrl@fc06a000 {\n"
  "> +\t\t\t\tboard {\n"
  "> +\t\t\t\t\tpinctrl_mmc1_cd: mmc1_cd {\n"
  "> +\t\t\t\t\t\tatmel,pins =\n"
@@ -202,14 +216,14 @@
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tusb0: gadget at 00400000 {\n"
+ "> +\t\tusb0: gadget@00400000 {\n"
  "> +\t\t\tatmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>;\n"
  "> +\t\t\tpinctrl-names = \"default\";\n"
  "> +\t\t\tpinctrl-0 = <&pinctrl_usba_vbus>;\n"
  "> +\t\t\tstatus = \"okay\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tusb1: ohci at 00500000 {\n"
+ "> +\t\tusb1: ohci@00500000 {\n"
  "> +\t\t\tnum-ports = <3>;\n"
  "> +\t\t\tatmel,vbus-gpio = <0\n"
  "> +\t\t\t\t\t   &pioE 11 GPIO_ACTIVE_HIGH\n"
@@ -218,43 +232,43 @@
  "> +\t\t\tstatus = \"okay\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tusb2: ehci at 00600000 {\n"
+ "> +\t\tusb2: ehci@00600000 {\n"
  "> +\t\t\tstatus = \"okay\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tnand0: nand at 80000000 {\n"
+ "> +\t\tnand0: nand@80000000 {\n"
  "> +\t\t\tnand-bus-width = <8>;\n"
  "> +\t\t\tnand-ecc-mode = \"hw\";\n"
  "> +\t\t\tnand-on-flash-bbt;\n"
  "> +\t\t\tatmel,has-pmecc;\n"
  "> +\t\t\tstatus = \"okay\";\n"
  "> +\n"
- "> +\t\t\tat91bootstrap at 0 {\n"
+ "> +\t\t\tat91bootstrap@0 {\n"
  "> +\t\t\t\tlabel = \"at91bootstrap\";\n"
  "> +\t\t\t\treg = <0x0 0x40000>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tbootloader at 40000 {\n"
+ "> +\t\t\tbootloader@40000 {\n"
  "> +\t\t\t\tlabel = \"bootloader\";\n"
  "> +\t\t\t\treg = <0x40000 0x80000>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tbootloaderenv at c0000 {\n"
+ "> +\t\t\tbootloaderenv@c0000 {\n"
  "> +\t\t\t\tlabel = \"bootloader env\";\n"
  "> +\t\t\t\treg = <0xc0000 0xc0000>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tdtb at 180000 {\n"
+ "> +\t\t\tdtb@180000 {\n"
  "> +\t\t\t\tlabel = \"device tree\";\n"
  "> +\t\t\t\treg = <0x180000 0x80000>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tkernel at 200000 {\n"
+ "> +\t\t\tkernel@200000 {\n"
  "> +\t\t\t\tlabel = \"kernel\";\n"
  "> +\t\t\t\treg = <0x200000 0x600000>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\trootfs at 800000 {\n"
+ "> +\t\t\trootfs@800000 {\n"
  "> +\t\t\t\tlabel = \"rootfs\";\n"
  "> +\t\t\t\treg = <0x800000 0x0f800000>;\n"
  "> +\t\t\t};\n"
@@ -305,4 +319,4 @@
  "-- \n"
  Nicolas Ferre
 
-ad120bac43ea798694a088bf8621d78e9d22bed18767e7580b9ac15e1e7c977f
+785c268d3d10422bbded2ffd0edf621b03922cb3a22137ba052804920a02cc34

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.