diff for duplicates of <20170314070732.GH3618@dragon>

diff --git a/a/1.txt b/N1/1.txt
index 8456474..d9ac5eb 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -70,26 +70,26 @@ https://lkml.org/lkml/2017/2/28/750
 We usually put the includes at the beginning of the file, and #include
 is more recommended than /include/.
 
-> +	fman at 1a00000 {
-> +		enet0: ethernet at e0000 {
+> +	fman@1a00000 {
+> +		enet0: ethernet@e0000 {
 > +		};
 > +
-> +		enet1: ethernet at e2000 {
+> +		enet1: ethernet@e2000 {
 > +		};
 > +
-> +		enet2: ethernet at e4000 {
+> +		enet2: ethernet@e4000 {
 > +		};
 > +
-> +		enet3: ethernet at e6000 {
+> +		enet3: ethernet@e6000 {
 > +		};
 > +
-> +		enet4: ethernet at e8000 {
+> +		enet4: ethernet@e8000 {
 > +		};
 > +
-> +		enet5: ethernet at ea000 {
+> +		enet5: ethernet@ea000 {
 > +		};
 > +
-> +		enet6: ethernet at f0000 {
+> +		enet6: ethernet@f0000 {
 > +		};
 > +	};
 
@@ -124,8 +124,8 @@ Move it to header of the file.
 Ditto
 
 > +&soc {
-> +	fman at 1a00000 {
-> +		ethernet at e0000 {
+> +	fman@1a00000 {
+> +		ethernet@e0000 {
 
 You defined enet0 label.  Why don't you use it?
 
@@ -133,71 +133,71 @@ You defined enet0 label.  Why don't you use it?
 > +			phy-connection-type = "qsgmii";
 > +		};
 > +
-> +		ethernet at e2000 {
+> +		ethernet@e2000 {
 > +			phy-handle = <&qsgmii_phy2>;
 > +			phy-connection-type = "qsgmii";
 > +		};
 > +
-> +		ethernet at e4000 {
+> +		ethernet@e4000 {
 > +			phy-handle = <&rgmii_phy1>;
 > +			phy-connection-type = "rgmii";
 > +		};
 > +
-> +		ethernet at e6000 {
+> +		ethernet@e6000 {
 > +			phy-handle = <&rgmii_phy2>;
 > +			phy-connection-type = "rgmii";
 > +		};
 > +
-> +		ethernet at e8000 {
+> +		ethernet@e8000 {
 > +			phy-handle = <&qsgmii_phy3>;
 > +			phy-connection-type = "qsgmii";
 > +		};
 > +
-> +		ethernet at ea000 {
+> +		ethernet@ea000 {
 > +			phy-handle = <&qsgmii_phy4>;
 > +			phy-connection-type = "qsgmii";
 > +		};
 > +
-> +		ethernet at f0000 { /* 10GEC1 */
+> +		ethernet@f0000 { /* 10GEC1 */
 > +			phy-handle = <&aqr105_phy>;
 > +			phy-connection-type = "xgmii";
 > +		};
 > +
-> +		mdio at fc000 {
+> +		mdio@fc000 {
 
 Use label reference the node you already define, so that you do not have
 to maintain the device tree hierarchy for referencing the node.
 
-> +			rgmii_phy1: ethernet-phy at 1 {
+> +			rgmii_phy1: ethernet-phy@1 {
 > +				reg = <0x1>;
 > +			};
 > +
-> +			rgmii_phy2: ethernet-phy at 2 {
+> +			rgmii_phy2: ethernet-phy@2 {
 > +				reg = <0x2>;
 > +			};
 > +
-> +			qsgmii_phy1: ethernet-phy at 3 {
+> +			qsgmii_phy1: ethernet-phy@3 {
 > +				reg = <0x4>;
 
 The unit address in the node name should match 'reg' value.
 
 > +			};
 > +
-> +			qsgmii_phy2: ethernet-phy at 4 {
+> +			qsgmii_phy2: ethernet-phy@4 {
 > +				reg = <0x5>;
 > +			};
 > +
-> +			qsgmii_phy3: ethernet-phy at 5 {
+> +			qsgmii_phy3: ethernet-phy@5 {
 > +				reg = <0x6>;
 > +			};
 > +
-> +			qsgmii_phy4: ethernet-phy at 6 {
+> +			qsgmii_phy4: ethernet-phy@6 {
 > +				reg = <0x7>;
 > +			};
 > +		};
 > +
-> +		mdio at fd000 {
-> +			aqr105_phy: ethernet-phy at c {
+> +		mdio@fd000 {
+> +			aqr105_phy: ethernet-phy@c {
 > +				compatible = "ethernet-phy-ieee802.3-c45";
 > +				interrupts = <0 132 4>;
 > +				reg = <0x1>;
@@ -252,11 +252,11 @@ The unit address in the node name should match 'reg' value.
 > +		};
 > +	};
 > +
-> +	bportals: bman-portals at 508000000 {
+> +	bportals: bman-portals@508000000 {
 > +		ranges = <0x0 0x5 0x08000000 0x8000000>;
 > +	};
 > +
-> +	qportals: qman-portals at 500000000 {
+> +	qportals: qman-portals@500000000 {
 > +		ranges = <0x0 0x5 0x00000000 0x8000000>;
 > +	};
 
@@ -280,19 +280,19 @@ Why are these two devices directly under root, not soc node?
 >  			};
 >  		};
 >  
-> +		qman: qman at 1880000 {
+> +		qman: qman@1880000 {
 > +			compatible = "fsl,qman";
 > +			reg = <0x00 0x1880000 0x0 0x10000>;
 > +			interrupts = <0 45 0x4>;
 > +		};
 > +
-> +		bman: bman at 1890000 {
+> +		bman: bman@1890000 {
 > +			compatible = "fsl,bman";
 > +			reg = <0x00 0x1890000 0x0 0x10000>;
 > +			interrupts = <0 45 0x4>;
 > +		};
 > +
->  		dspi0: dspi at 2100000 {
+>  		dspi0: dspi@2100000 {
 >  			compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi";
 >  			#address-cells = <1>;
 > @@ -686,3 +739,21 @@
@@ -345,55 +345,55 @@ Shawn
 > +	#size-cells = <1>;
 > +	compatible = "simple-bus";
 > +
-> +	bman-portal at 0 {
+> +	bman-portal@0 {
 > +		compatible = "fsl,bman-portal";
 > +		reg = <0x0 0x4000 0x4000000 0x4000>;
 > +		interrupts = <0 173 0x4>;
 > +	};
 > +
-> +	bman-portal at 10000 {
+> +	bman-portal@10000 {
 > +		compatible = "fsl,bman-portal";
 > +		reg = <0x10000 0x4000 0x4010000 0x4000>;
 > +		interrupts = <0 175 0x4>;
 > +	};
 > +
-> +	bman-portal at 20000 {
+> +	bman-portal@20000 {
 > +		compatible = "fsl,bman-portal";
 > +		reg = <0x20000 0x4000 0x4020000 0x4000>;
 > +		interrupts = <0 177 0x4>;
 > +	};
 > +
-> +	bman-portal at 30000 {
+> +	bman-portal@30000 {
 > +		compatible = "fsl,bman-portal";
 > +		reg = <0x30000 0x4000 0x4030000 0x4000>;
 > +		interrupts = <0 179 0x4>;
 > +	};
 > +
-> +	bman-portal at 40000 {
+> +	bman-portal@40000 {
 > +		compatible = "fsl,bman-portal";
 > +		reg = <0x40000 0x4000 0x4040000 0x4000>;
 > +		interrupts = <0 181 0x4>;
 > +	};
 > +
-> +	bman-portal at 50000 {
+> +	bman-portal@50000 {
 > +		compatible = "fsl,bman-portal";
 > +		reg = <0x50000 0x4000 0x4050000 0x4000>;
 > +		interrupts = <0 183 0x4>;
 > +	};
 > +
-> +	bman-portal at 60000 {
+> +	bman-portal@60000 {
 > +		compatible = "fsl,bman-portal";
 > +		reg = <0x60000 0x4000 0x4060000 0x4000>;
 > +		interrupts = <0 185 0x4>;
 > +	};
 > +
-> +	bman-portal at 70000 {
+> +	bman-portal@70000 {
 > +		compatible = "fsl,bman-portal";
 > +		reg = <0x70000 0x4000 0x4070000 0x4000>;
 > +		interrupts = <0 187 0x4>;
 > +	};
 > +
-> +	bman-portal at 80000 {
+> +	bman-portal@80000 {
 > +		compatible = "fsl,bman-portal";
 > +		reg = <0x80000 0x4000 0x4080000 0x4000>;
 > +		interrupts = <0 189 0x4>;
@@ -413,22 +413,22 @@ Shawn
 > + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 > + */
 > +
-> +fman at 1a00000 {
-> +	fman0_rx_0x10: port at 90000 {
+> +fman@1a00000 {
+> +	fman0_rx_0x10: port@90000 {
 > +		cell-index = <0x10>;
 > +		compatible = "fsl,fman-v3-port-rx";
 > +		reg = <0x90000 0x1000>;
 > +		fsl,fman-10g-port;
 > +	};
 > +
-> +	fman0_tx_0x30: port at b0000 {
+> +	fman0_tx_0x30: port@b0000 {
 > +		cell-index = <0x30>;
 > +		compatible = "fsl,fman-v3-port-tx";
 > +		reg = <0xb0000 0x1000>;
 > +		fsl,fman-10g-port;
 > +	};
 > +
-> +	ethernet at f0000 {
+> +	ethernet@f0000 {
 > +		cell-index = <0x8>;
 > +		compatible = "fsl,fman-memac";
 > +		reg = <0xf0000 0x1000>;
@@ -436,13 +436,13 @@ Shawn
 > +		pcsphy-handle = <&pcsphy6>;
 > +	};
 > +
-> +	mdio at f1000 {
+> +	mdio@f1000 {
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
 > +		reg = <0xf1000 0x1000>;
 > +
-> +		pcsphy6: ethernet-phy at 0 {
+> +		pcsphy6: ethernet-phy@0 {
 > +			reg = <0x0>;
 > +		};
 > +	};
@@ -461,20 +461,20 @@ Shawn
 > + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 > + */
 > +
-> +fman at 1a00000 {
-> +	fman0_rx_0x08: port at 88000 {
+> +fman@1a00000 {
+> +	fman0_rx_0x08: port@88000 {
 > +		cell-index = <0x8>;
 > +		compatible = "fsl,fman-v3-port-rx";
 > +		reg = <0x88000 0x1000>;
 > +	};
 > +
-> +	fman0_tx_0x28: port at a8000 {
+> +	fman0_tx_0x28: port@a8000 {
 > +		cell-index = <0x28>;
 > +		compatible = "fsl,fman-v3-port-tx";
 > +		reg = <0xa8000 0x1000>;
 > +	};
 > +
-> +	ethernet at e0000 {
+> +	ethernet@e0000 {
 > +		cell-index = <0>;
 > +		compatible = "fsl,fman-memac";
 > +		reg = <0xe0000 0x1000>;
@@ -483,13 +483,13 @@ Shawn
 > +		pcsphy-handle = <&pcsphy0>;
 > +	};
 > +
-> +	mdio at e1000 {
+> +	mdio@e1000 {
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
 > +		reg = <0xe1000 0x1000>;
 > +
-> +		pcsphy0: ethernet-phy at 0 {
+> +		pcsphy0: ethernet-phy@0 {
 > +			reg = <0x0>;
 > +		};
 > +	};
@@ -508,20 +508,20 @@ Shawn
 > + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 > + */
 > +
-> +fman at 1a00000 {
-> +	fman0_rx_0x09: port at 89000 {
+> +fman@1a00000 {
+> +	fman0_rx_0x09: port@89000 {
 > +		cell-index = <0x9>;
 > +		compatible = "fsl,fman-v3-port-rx";
 > +		reg = <0x89000 0x1000>;
 > +	};
 > +
-> +	fman0_tx_0x29: port at a9000 {
+> +	fman0_tx_0x29: port@a9000 {
 > +		cell-index = <0x29>;
 > +		compatible = "fsl,fman-v3-port-tx";
 > +		reg = <0xa9000 0x1000>;
 > +	};
 > +
-> +	ethernet at e2000 {
+> +	ethernet@e2000 {
 > +		cell-index = <1>;
 > +		compatible = "fsl,fman-memac";
 > +		reg = <0xe2000 0x1000>;
@@ -530,13 +530,13 @@ Shawn
 > +		pcsphy-handle = <&pcsphy1>;
 > +	};
 > +
-> +	mdio at e3000 {
+> +	mdio@e3000 {
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
 > +		reg = <0xe3000 0x1000>;
 > +
-> +		pcsphy1: ethernet-phy at 0 {
+> +		pcsphy1: ethernet-phy@0 {
 > +			reg = <0x0>;
 > +		};
 > +	};
@@ -555,20 +555,20 @@ Shawn
 > + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 > + */
 > +
-> +fman at 1a00000 {
-> +	fman0_rx_0x0a: port at 8a000 {
+> +fman@1a00000 {
+> +	fman0_rx_0x0a: port@8a000 {
 > +		cell-index = <0xa>;
 > +		compatible = "fsl,fman-v3-port-rx";
 > +		reg = <0x8a000 0x1000>;
 > +	};
 > +
-> +	fman0_tx_0x2a: port at aa000 {
+> +	fman0_tx_0x2a: port@aa000 {
 > +		cell-index = <0x2a>;
 > +		compatible = "fsl,fman-v3-port-tx";
 > +		reg = <0xaa000 0x1000>;
 > +	};
 > +
-> +	ethernet at e4000 {
+> +	ethernet@e4000 {
 > +		cell-index = <2>;
 > +		compatible = "fsl,fman-memac";
 > +		reg = <0xe4000 0x1000>;
@@ -577,13 +577,13 @@ Shawn
 > +		pcsphy-handle = <&pcsphy2>;
 > +	};
 > +
-> +	mdio at e5000 {
+> +	mdio@e5000 {
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
 > +		reg = <0xe5000 0x1000>;
 > +
-> +		pcsphy2: ethernet-phy at 0 {
+> +		pcsphy2: ethernet-phy@0 {
 > +			reg = <0x0>;
 > +		};
 > +	};
@@ -602,20 +602,20 @@ Shawn
 > + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 > + */
 > +
-> +fman at 1a00000 {
-> +	fman0_rx_0x0b: port at 8b000 {
+> +fman@1a00000 {
+> +	fman0_rx_0x0b: port@8b000 {
 > +		cell-index = <0xb>;
 > +		compatible = "fsl,fman-v3-port-rx";
 > +		reg = <0x8b000 0x1000>;
 > +	};
 > +
-> +	fman0_tx_0x2b: port at ab000 {
+> +	fman0_tx_0x2b: port@ab000 {
 > +		cell-index = <0x2b>;
 > +		compatible = "fsl,fman-v3-port-tx";
 > +		reg = <0xab000 0x1000>;
 > +	};
 > +
-> +	ethernet at e6000 {
+> +	ethernet@e6000 {
 > +		cell-index = <3>;
 > +		compatible = "fsl,fman-memac";
 > +		reg = <0xe6000 0x1000>;
@@ -624,13 +624,13 @@ Shawn
 > +		pcsphy-handle = <&pcsphy3>;
 > +	};
 > +
-> +	mdio at e7000 {
+> +	mdio@e7000 {
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
 > +		reg = <0xe7000 0x1000>;
 > +
-> +		pcsphy3: ethernet-phy at 0 {
+> +		pcsphy3: ethernet-phy@0 {
 > +			reg = <0x0>;
 > +		};
 > +	};
@@ -649,20 +649,20 @@ Shawn
 > + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 > + */
 > +
-> +fman at 1a00000 {
-> +	fman0_rx_0x0c: port at 8c000 {
+> +fman@1a00000 {
+> +	fman0_rx_0x0c: port@8c000 {
 > +		cell-index = <0xc>;
 > +		compatible = "fsl,fman-v3-port-rx";
 > +		reg = <0x8c000 0x1000>;
 > +	};
 > +
-> +	fman0_tx_0x2c: port at ac000 {
+> +	fman0_tx_0x2c: port@ac000 {
 > +		cell-index = <0x2c>;
 > +		compatible = "fsl,fman-v3-port-tx";
 > +		reg = <0xac000 0x1000>;
 > +	};
 > +
-> +	ethernet at e8000 {
+> +	ethernet@e8000 {
 > +		cell-index = <4>;
 > +		compatible = "fsl,fman-memac";
 > +		reg = <0xe8000 0x1000>;
@@ -671,13 +671,13 @@ Shawn
 > +		pcsphy-handle = <&pcsphy4>;
 > +	};
 > +
-> +	mdio at e9000 {
+> +	mdio@e9000 {
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
 > +		reg = <0xe9000 0x1000>;
 > +
-> +		pcsphy4: ethernet-phy at 0 {
+> +		pcsphy4: ethernet-phy@0 {
 > +			reg = <0x0>;
 > +		};
 > +	};
@@ -696,20 +696,20 @@ Shawn
 > + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 > + */
 > +
-> +fman at 1a00000 {
-> +	fman0_rx_0x0d: port at 8d000 {
+> +fman@1a00000 {
+> +	fman0_rx_0x0d: port@8d000 {
 > +		cell-index = <0xd>;
 > +		compatible = "fsl,fman-v3-port-rx";
 > +		reg = <0x8d000 0x1000>;
 > +	};
 > +
-> +	fman0_tx_0x2d: port at ad000 {
+> +	fman0_tx_0x2d: port@ad000 {
 > +		cell-index = <0x2d>;
 > +		compatible = "fsl,fman-v3-port-tx";
 > +		reg = <0xad000 0x1000>;
 > +	};
 > +
-> +	ethernet at ea000 {
+> +	ethernet@ea000 {
 > +		cell-index = <5>;
 > +		compatible = "fsl,fman-memac";
 > +		reg = <0xea000 0x1000>;
@@ -718,13 +718,13 @@ Shawn
 > +		pcsphy-handle = <&pcsphy5>;
 > +	};
 > +
-> +	mdio at eb000 {
+> +	mdio@eb000 {
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
 > +		reg = <0xeb000 0x1000>;
 > +
-> +		pcsphy5: ethernet-phy at 0 {
+> +		pcsphy5: ethernet-phy@0 {
 > +			reg = <0x0>;
 > +		};
 > +	};
@@ -743,7 +743,7 @@ Shawn
 > + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
 > + */
 > +
-> +fman0: fman at 1a00000 {
+> +fman0: fman@1a00000 {
 > +	#address-cells = <1>;
 > +	#size-cells = <1>;
 > +	cell-index = <0>;
@@ -755,62 +755,62 @@ Shawn
 > +	clock-names = "fmanclk";
 > +	fsl,qman-channel-range = <0x800 0x10>;
 > +
-> +	muram at 0 {
+> +	muram@0 {
 > +		compatible = "fsl,fman-muram";
 > +		reg = <0x0 0x60000>;
 > +	};
 > +
-> +	fman0_oh_0x2: port at 82000 {
+> +	fman0_oh_0x2: port@82000 {
 > +		cell-index = <0x2>;
 > +		compatible = "fsl,fman-v3-port-oh";
 > +		reg = <0x82000 0x1000>;
 > +	};
 > +
-> +	fman0_oh_0x3: port at 83000 {
+> +	fman0_oh_0x3: port@83000 {
 > +		cell-index = <0x3>;
 > +		compatible = "fsl,fman-v3-port-oh";
 > +		reg = <0x83000 0x1000>;
 > +	};
 > +
-> +	fman0_oh_0x4: port at 84000 {
+> +	fman0_oh_0x4: port@84000 {
 > +		cell-index = <0x4>;
 > +		compatible = "fsl,fman-v3-port-oh";
 > +		reg = <0x84000 0x1000>;
 > +	};
 > +
-> +	fman0_oh_0x5: port at 85000 {
+> +	fman0_oh_0x5: port@85000 {
 > +		cell-index = <0x5>;
 > +		compatible = "fsl,fman-v3-port-oh";
 > +		reg = <0x85000 0x1000>;
 > +	};
 > +
-> +	fman0_oh_0x6: port at 86000 {
+> +	fman0_oh_0x6: port@86000 {
 > +		cell-index = <0x6>;
 > +		compatible = "fsl,fman-v3-port-oh";
 > +		reg = <0x86000 0x1000>;
 > +	};
 > +
-> +	fman0_oh_0x7: port at 87000 {
+> +	fman0_oh_0x7: port@87000 {
 > +		cell-index = <0x7>;
 > +		compatible = "fsl,fman-v3-port-oh";
 > +		reg = <0x87000 0x1000>;
 > +	};
 > +
-> +	mdio0: mdio at fc000 {
+> +	mdio0: mdio@fc000 {
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
 > +		reg = <0xfc000 0x1000>;
 > +	};
 > +
-> +	xmdio0: mdio at fd000 {
+> +	xmdio0: mdio@fd000 {
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
 > +		reg = <0xfd000 0x1000>;
 > +	};
 > +
-> +	ptp_timer0: ptp-timer at fe000 {
+> +	ptp_timer0: ptp-timer@fe000 {
 > +		compatible = "fsl,fman-ptp-timer";
 > +		reg = <0xfe000 0x1000>;
 > +	};
@@ -834,63 +834,63 @@ Shawn
 > +	#size-cells = <1>;
 > +	compatible = "simple-bus";
 > +
-> +	qportal0: qman-portal at 0 {
+> +	qportal0: qman-portal@0 {
 > +		compatible = "fsl,qman-portal";
 > +		reg = <0x0 0x4000 0x4000000 0x4000>;
 > +		interrupts = <0 172 0x4>;
 > +		cell-index = <0>;
 > +	};
 > +
-> +	qportal1: qman-portal at 10000 {
+> +	qportal1: qman-portal@10000 {
 > +		compatible = "fsl,qman-portal";
 > +		reg = <0x10000 0x4000 0x4010000 0x4000>;
 > +		interrupts = <0 174 0x4>;
 > +		cell-index = <1>;
 > +	};
 > +
-> +	qportal2: qman-portal at 20000 {
+> +	qportal2: qman-portal@20000 {
 > +		compatible = "fsl,qman-portal";
 > +		reg = <0x20000 0x4000 0x4020000 0x4000>;
 > +		interrupts = <0 176 0x4>;
 > +		cell-index = <2>;
 > +	};
 > +
-> +	qportal3: qman-portal at 30000 {
+> +	qportal3: qman-portal@30000 {
 > +		compatible = "fsl,qman-portal";
 > +		reg = <0x30000 0x4000 0x4030000 0x4000>;
 > +		interrupts = <0 178 0x4>;
 > +		cell-index = <3>;
 > +	};
 > +
-> +	qportal4: qman-portal at 40000 {
+> +	qportal4: qman-portal@40000 {
 > +		compatible = "fsl,qman-portal";
 > +		reg = <0x40000 0x4000 0x4040000 0x4000>;
 > +		interrupts = <0 180 0x4>;
 > +		cell-index = <4>;
 > +	};
 > +
-> +	qportal5: qman-portal at 50000 {
+> +	qportal5: qman-portal@50000 {
 > +		compatible = "fsl,qman-portal";
 > +		reg = <0x50000 0x4000 0x4050000 0x4000>;
 > +		interrupts = <0 182 0x4>;
 > +		cell-index = <5>;
 > +	};
 > +
-> +	qportal6: qman-portal at 60000 {
+> +	qportal6: qman-portal@60000 {
 > +		compatible = "fsl,qman-portal";
 > +		reg = <0x60000 0x4000 0x4060000 0x4000>;
 > +		interrupts = <0 184 0x4>;
 > +		cell-index = <6>;
 > +	};
 > +
-> +	qportal7: qman-portal at 70000 {
+> +	qportal7: qman-portal@70000 {
 > +		compatible = "fsl,qman-portal";
 > +		reg = <0x70000 0x4000 0x4070000 0x4000>;
 > +		interrupts = <0 186 0x4>;
 > +		cell-index = <7>;
 > +	};
 > +
-> +	qportal8: qman-portal at 80000 {
+> +	qportal8: qman-portal@80000 {
 > +		compatible = "fsl,qman-portal";
 > +		reg = <0x80000 0x4000 0x4080000 0x4000>;
 > +		interrupts = <0 188 0x4>;
@@ -903,5 +903,5 @@ Shawn
 > 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel at lists.infradead.org
+> linux-arm-kernel@lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index 55f5553..030c589 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,16 @@
  "ref\01488382505-17554-1-git-send-email-madalin.bucur@nxp.com\0"
  "ref\01488382505-17554-2-git-send-email-madalin.bucur@nxp.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH v2 1/2] dts: arm64: add LS1043A DPAA support\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH v2 1/2] dts: arm64: add LS1043A DPAA support\0"
  "Date\0Tue, 14 Mar 2017 15:07:34 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Madalin Bucur <madalin.bucur@nxp.com>\0"
+ "Cc\0mark.rutland@arm.com"
+  devicetree@vger.kernel.org
+  catalin.marinas@arm.com
+  will.deacon@arm.com
+  linux-kernel@vger.kernel.org
+  robh+dt@kernel.org
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Wed, Mar 01, 2017 at 05:35:04PM +0200, Madalin Bucur wrote:\n"
@@ -78,26 +85,26 @@
  "We usually put the includes at the beginning of the file, and #include\n"
  "is more recommended than /include/.\n"
  "\n"
- "> +\tfman at 1a00000 {\n"
- "> +\t\tenet0: ethernet at e0000 {\n"
+ "> +\tfman@1a00000 {\n"
+ "> +\t\tenet0: ethernet@e0000 {\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tenet1: ethernet at e2000 {\n"
+ "> +\t\tenet1: ethernet@e2000 {\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tenet2: ethernet at e4000 {\n"
+ "> +\t\tenet2: ethernet@e4000 {\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tenet3: ethernet at e6000 {\n"
+ "> +\t\tenet3: ethernet@e6000 {\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tenet4: ethernet at e8000 {\n"
+ "> +\t\tenet4: ethernet@e8000 {\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tenet5: ethernet at ea000 {\n"
+ "> +\t\tenet5: ethernet@ea000 {\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tenet6: ethernet at f0000 {\n"
+ "> +\t\tenet6: ethernet@f0000 {\n"
  "> +\t\t};\n"
  "> +\t};\n"
  "\n"
@@ -132,8 +139,8 @@
  "Ditto\n"
  "\n"
  "> +&soc {\n"
- "> +\tfman at 1a00000 {\n"
- "> +\t\tethernet at e0000 {\n"
+ "> +\tfman@1a00000 {\n"
+ "> +\t\tethernet@e0000 {\n"
  "\n"
  "You defined enet0 label.  Why don't you use it?\n"
  "\n"
@@ -141,71 +148,71 @@
  "> +\t\t\tphy-connection-type = \"qsgmii\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tethernet at e2000 {\n"
+ "> +\t\tethernet@e2000 {\n"
  "> +\t\t\tphy-handle = <&qsgmii_phy2>;\n"
  "> +\t\t\tphy-connection-type = \"qsgmii\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tethernet at e4000 {\n"
+ "> +\t\tethernet@e4000 {\n"
  "> +\t\t\tphy-handle = <&rgmii_phy1>;\n"
  "> +\t\t\tphy-connection-type = \"rgmii\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tethernet at e6000 {\n"
+ "> +\t\tethernet@e6000 {\n"
  "> +\t\t\tphy-handle = <&rgmii_phy2>;\n"
  "> +\t\t\tphy-connection-type = \"rgmii\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tethernet at e8000 {\n"
+ "> +\t\tethernet@e8000 {\n"
  "> +\t\t\tphy-handle = <&qsgmii_phy3>;\n"
  "> +\t\t\tphy-connection-type = \"qsgmii\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tethernet at ea000 {\n"
+ "> +\t\tethernet@ea000 {\n"
  "> +\t\t\tphy-handle = <&qsgmii_phy4>;\n"
  "> +\t\t\tphy-connection-type = \"qsgmii\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tethernet at f0000 { /* 10GEC1 */\n"
+ "> +\t\tethernet@f0000 { /* 10GEC1 */\n"
  "> +\t\t\tphy-handle = <&aqr105_phy>;\n"
  "> +\t\t\tphy-connection-type = \"xgmii\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tmdio at fc000 {\n"
+ "> +\t\tmdio@fc000 {\n"
  "\n"
  "Use label reference the node you already define, so that you do not have\n"
  "to maintain the device tree hierarchy for referencing the node.\n"
  "\n"
- "> +\t\t\trgmii_phy1: ethernet-phy at 1 {\n"
+ "> +\t\t\trgmii_phy1: ethernet-phy@1 {\n"
  "> +\t\t\t\treg = <0x1>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\trgmii_phy2: ethernet-phy at 2 {\n"
+ "> +\t\t\trgmii_phy2: ethernet-phy@2 {\n"
  "> +\t\t\t\treg = <0x2>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tqsgmii_phy1: ethernet-phy at 3 {\n"
+ "> +\t\t\tqsgmii_phy1: ethernet-phy@3 {\n"
  "> +\t\t\t\treg = <0x4>;\n"
  "\n"
  "The unit address in the node name should match 'reg' value.\n"
  "\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tqsgmii_phy2: ethernet-phy at 4 {\n"
+ "> +\t\t\tqsgmii_phy2: ethernet-phy@4 {\n"
  "> +\t\t\t\treg = <0x5>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tqsgmii_phy3: ethernet-phy at 5 {\n"
+ "> +\t\t\tqsgmii_phy3: ethernet-phy@5 {\n"
  "> +\t\t\t\treg = <0x6>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tqsgmii_phy4: ethernet-phy at 6 {\n"
+ "> +\t\t\tqsgmii_phy4: ethernet-phy@6 {\n"
  "> +\t\t\t\treg = <0x7>;\n"
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tmdio at fd000 {\n"
- "> +\t\t\taqr105_phy: ethernet-phy at c {\n"
+ "> +\t\tmdio@fd000 {\n"
+ "> +\t\t\taqr105_phy: ethernet-phy@c {\n"
  "> +\t\t\t\tcompatible = \"ethernet-phy-ieee802.3-c45\";\n"
  "> +\t\t\t\tinterrupts = <0 132 4>;\n"
  "> +\t\t\t\treg = <0x1>;\n"
@@ -260,11 +267,11 @@
  "> +\t\t};\n"
  "> +\t};\n"
  "> +\n"
- "> +\tbportals: bman-portals at 508000000 {\n"
+ "> +\tbportals: bman-portals@508000000 {\n"
  "> +\t\tranges = <0x0 0x5 0x08000000 0x8000000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tqportals: qman-portals at 500000000 {\n"
+ "> +\tqportals: qman-portals@500000000 {\n"
  "> +\t\tranges = <0x0 0x5 0x00000000 0x8000000>;\n"
  "> +\t};\n"
  "\n"
@@ -288,19 +295,19 @@
  ">  \t\t\t};\n"
  ">  \t\t};\n"
  ">  \n"
- "> +\t\tqman: qman at 1880000 {\n"
+ "> +\t\tqman: qman@1880000 {\n"
  "> +\t\t\tcompatible = \"fsl,qman\";\n"
  "> +\t\t\treg = <0x00 0x1880000 0x0 0x10000>;\n"
  "> +\t\t\tinterrupts = <0 45 0x4>;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tbman: bman at 1890000 {\n"
+ "> +\t\tbman: bman@1890000 {\n"
  "> +\t\t\tcompatible = \"fsl,bman\";\n"
  "> +\t\t\treg = <0x00 0x1890000 0x0 0x10000>;\n"
  "> +\t\t\tinterrupts = <0 45 0x4>;\n"
  "> +\t\t};\n"
  "> +\n"
- ">  \t\tdspi0: dspi at 2100000 {\n"
+ ">  \t\tdspi0: dspi@2100000 {\n"
  ">  \t\t\tcompatible = \"fsl,ls1043a-dspi\", \"fsl,ls1021a-v1.0-dspi\";\n"
  ">  \t\t\t#address-cells = <1>;\n"
  "> @@ -686,3 +739,21 @@\n"
@@ -353,55 +360,55 @@
  "> +\t#size-cells = <1>;\n"
  "> +\tcompatible = \"simple-bus\";\n"
  "> +\n"
- "> +\tbman-portal at 0 {\n"
+ "> +\tbman-portal@0 {\n"
  "> +\t\tcompatible = \"fsl,bman-portal\";\n"
  "> +\t\treg = <0x0 0x4000 0x4000000 0x4000>;\n"
  "> +\t\tinterrupts = <0 173 0x4>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tbman-portal at 10000 {\n"
+ "> +\tbman-portal@10000 {\n"
  "> +\t\tcompatible = \"fsl,bman-portal\";\n"
  "> +\t\treg = <0x10000 0x4000 0x4010000 0x4000>;\n"
  "> +\t\tinterrupts = <0 175 0x4>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tbman-portal at 20000 {\n"
+ "> +\tbman-portal@20000 {\n"
  "> +\t\tcompatible = \"fsl,bman-portal\";\n"
  "> +\t\treg = <0x20000 0x4000 0x4020000 0x4000>;\n"
  "> +\t\tinterrupts = <0 177 0x4>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tbman-portal at 30000 {\n"
+ "> +\tbman-portal@30000 {\n"
  "> +\t\tcompatible = \"fsl,bman-portal\";\n"
  "> +\t\treg = <0x30000 0x4000 0x4030000 0x4000>;\n"
  "> +\t\tinterrupts = <0 179 0x4>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tbman-portal at 40000 {\n"
+ "> +\tbman-portal@40000 {\n"
  "> +\t\tcompatible = \"fsl,bman-portal\";\n"
  "> +\t\treg = <0x40000 0x4000 0x4040000 0x4000>;\n"
  "> +\t\tinterrupts = <0 181 0x4>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tbman-portal at 50000 {\n"
+ "> +\tbman-portal@50000 {\n"
  "> +\t\tcompatible = \"fsl,bman-portal\";\n"
  "> +\t\treg = <0x50000 0x4000 0x4050000 0x4000>;\n"
  "> +\t\tinterrupts = <0 183 0x4>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tbman-portal at 60000 {\n"
+ "> +\tbman-portal@60000 {\n"
  "> +\t\tcompatible = \"fsl,bman-portal\";\n"
  "> +\t\treg = <0x60000 0x4000 0x4060000 0x4000>;\n"
  "> +\t\tinterrupts = <0 185 0x4>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tbman-portal at 70000 {\n"
+ "> +\tbman-portal@70000 {\n"
  "> +\t\tcompatible = \"fsl,bman-portal\";\n"
  "> +\t\treg = <0x70000 0x4000 0x4070000 0x4000>;\n"
  "> +\t\tinterrupts = <0 187 0x4>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tbman-portal at 80000 {\n"
+ "> +\tbman-portal@80000 {\n"
  "> +\t\tcompatible = \"fsl,bman-portal\";\n"
  "> +\t\treg = <0x80000 0x4000 0x4080000 0x4000>;\n"
  "> +\t\tinterrupts = <0 189 0x4>;\n"
@@ -421,22 +428,22 @@
  "> + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)\n"
  "> + */\n"
  "> +\n"
- "> +fman at 1a00000 {\n"
- "> +\tfman0_rx_0x10: port at 90000 {\n"
+ "> +fman@1a00000 {\n"
+ "> +\tfman0_rx_0x10: port@90000 {\n"
  "> +\t\tcell-index = <0x10>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-rx\";\n"
  "> +\t\treg = <0x90000 0x1000>;\n"
  "> +\t\tfsl,fman-10g-port;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfman0_tx_0x30: port at b0000 {\n"
+ "> +\tfman0_tx_0x30: port@b0000 {\n"
  "> +\t\tcell-index = <0x30>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-tx\";\n"
  "> +\t\treg = <0xb0000 0x1000>;\n"
  "> +\t\tfsl,fman-10g-port;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tethernet at f0000 {\n"
+ "> +\tethernet@f0000 {\n"
  "> +\t\tcell-index = <0x8>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac\";\n"
  "> +\t\treg = <0xf0000 0x1000>;\n"
@@ -444,13 +451,13 @@
  "> +\t\tpcsphy-handle = <&pcsphy6>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tmdio at f1000 {\n"
+ "> +\tmdio@f1000 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac-mdio\", \"fsl,fman-xmdio\";\n"
  "> +\t\treg = <0xf1000 0x1000>;\n"
  "> +\n"
- "> +\t\tpcsphy6: ethernet-phy at 0 {\n"
+ "> +\t\tpcsphy6: ethernet-phy@0 {\n"
  "> +\t\t\treg = <0x0>;\n"
  "> +\t\t};\n"
  "> +\t};\n"
@@ -469,20 +476,20 @@
  "> + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)\n"
  "> + */\n"
  "> +\n"
- "> +fman at 1a00000 {\n"
- "> +\tfman0_rx_0x08: port at 88000 {\n"
+ "> +fman@1a00000 {\n"
+ "> +\tfman0_rx_0x08: port@88000 {\n"
  "> +\t\tcell-index = <0x8>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-rx\";\n"
  "> +\t\treg = <0x88000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfman0_tx_0x28: port at a8000 {\n"
+ "> +\tfman0_tx_0x28: port@a8000 {\n"
  "> +\t\tcell-index = <0x28>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-tx\";\n"
  "> +\t\treg = <0xa8000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tethernet at e0000 {\n"
+ "> +\tethernet@e0000 {\n"
  "> +\t\tcell-index = <0>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac\";\n"
  "> +\t\treg = <0xe0000 0x1000>;\n"
@@ -491,13 +498,13 @@
  "> +\t\tpcsphy-handle = <&pcsphy0>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tmdio at e1000 {\n"
+ "> +\tmdio@e1000 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac-mdio\", \"fsl,fman-xmdio\";\n"
  "> +\t\treg = <0xe1000 0x1000>;\n"
  "> +\n"
- "> +\t\tpcsphy0: ethernet-phy at 0 {\n"
+ "> +\t\tpcsphy0: ethernet-phy@0 {\n"
  "> +\t\t\treg = <0x0>;\n"
  "> +\t\t};\n"
  "> +\t};\n"
@@ -516,20 +523,20 @@
  "> + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)\n"
  "> + */\n"
  "> +\n"
- "> +fman at 1a00000 {\n"
- "> +\tfman0_rx_0x09: port at 89000 {\n"
+ "> +fman@1a00000 {\n"
+ "> +\tfman0_rx_0x09: port@89000 {\n"
  "> +\t\tcell-index = <0x9>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-rx\";\n"
  "> +\t\treg = <0x89000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfman0_tx_0x29: port at a9000 {\n"
+ "> +\tfman0_tx_0x29: port@a9000 {\n"
  "> +\t\tcell-index = <0x29>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-tx\";\n"
  "> +\t\treg = <0xa9000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tethernet at e2000 {\n"
+ "> +\tethernet@e2000 {\n"
  "> +\t\tcell-index = <1>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac\";\n"
  "> +\t\treg = <0xe2000 0x1000>;\n"
@@ -538,13 +545,13 @@
  "> +\t\tpcsphy-handle = <&pcsphy1>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tmdio at e3000 {\n"
+ "> +\tmdio@e3000 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac-mdio\", \"fsl,fman-xmdio\";\n"
  "> +\t\treg = <0xe3000 0x1000>;\n"
  "> +\n"
- "> +\t\tpcsphy1: ethernet-phy at 0 {\n"
+ "> +\t\tpcsphy1: ethernet-phy@0 {\n"
  "> +\t\t\treg = <0x0>;\n"
  "> +\t\t};\n"
  "> +\t};\n"
@@ -563,20 +570,20 @@
  "> + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)\n"
  "> + */\n"
  "> +\n"
- "> +fman at 1a00000 {\n"
- "> +\tfman0_rx_0x0a: port at 8a000 {\n"
+ "> +fman@1a00000 {\n"
+ "> +\tfman0_rx_0x0a: port@8a000 {\n"
  "> +\t\tcell-index = <0xa>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-rx\";\n"
  "> +\t\treg = <0x8a000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfman0_tx_0x2a: port at aa000 {\n"
+ "> +\tfman0_tx_0x2a: port@aa000 {\n"
  "> +\t\tcell-index = <0x2a>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-tx\";\n"
  "> +\t\treg = <0xaa000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tethernet at e4000 {\n"
+ "> +\tethernet@e4000 {\n"
  "> +\t\tcell-index = <2>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac\";\n"
  "> +\t\treg = <0xe4000 0x1000>;\n"
@@ -585,13 +592,13 @@
  "> +\t\tpcsphy-handle = <&pcsphy2>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tmdio at e5000 {\n"
+ "> +\tmdio@e5000 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac-mdio\", \"fsl,fman-xmdio\";\n"
  "> +\t\treg = <0xe5000 0x1000>;\n"
  "> +\n"
- "> +\t\tpcsphy2: ethernet-phy at 0 {\n"
+ "> +\t\tpcsphy2: ethernet-phy@0 {\n"
  "> +\t\t\treg = <0x0>;\n"
  "> +\t\t};\n"
  "> +\t};\n"
@@ -610,20 +617,20 @@
  "> + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)\n"
  "> + */\n"
  "> +\n"
- "> +fman at 1a00000 {\n"
- "> +\tfman0_rx_0x0b: port at 8b000 {\n"
+ "> +fman@1a00000 {\n"
+ "> +\tfman0_rx_0x0b: port@8b000 {\n"
  "> +\t\tcell-index = <0xb>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-rx\";\n"
  "> +\t\treg = <0x8b000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfman0_tx_0x2b: port at ab000 {\n"
+ "> +\tfman0_tx_0x2b: port@ab000 {\n"
  "> +\t\tcell-index = <0x2b>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-tx\";\n"
  "> +\t\treg = <0xab000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tethernet at e6000 {\n"
+ "> +\tethernet@e6000 {\n"
  "> +\t\tcell-index = <3>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac\";\n"
  "> +\t\treg = <0xe6000 0x1000>;\n"
@@ -632,13 +639,13 @@
  "> +\t\tpcsphy-handle = <&pcsphy3>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tmdio at e7000 {\n"
+ "> +\tmdio@e7000 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac-mdio\", \"fsl,fman-xmdio\";\n"
  "> +\t\treg = <0xe7000 0x1000>;\n"
  "> +\n"
- "> +\t\tpcsphy3: ethernet-phy at 0 {\n"
+ "> +\t\tpcsphy3: ethernet-phy@0 {\n"
  "> +\t\t\treg = <0x0>;\n"
  "> +\t\t};\n"
  "> +\t};\n"
@@ -657,20 +664,20 @@
  "> + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)\n"
  "> + */\n"
  "> +\n"
- "> +fman at 1a00000 {\n"
- "> +\tfman0_rx_0x0c: port at 8c000 {\n"
+ "> +fman@1a00000 {\n"
+ "> +\tfman0_rx_0x0c: port@8c000 {\n"
  "> +\t\tcell-index = <0xc>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-rx\";\n"
  "> +\t\treg = <0x8c000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfman0_tx_0x2c: port at ac000 {\n"
+ "> +\tfman0_tx_0x2c: port@ac000 {\n"
  "> +\t\tcell-index = <0x2c>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-tx\";\n"
  "> +\t\treg = <0xac000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tethernet at e8000 {\n"
+ "> +\tethernet@e8000 {\n"
  "> +\t\tcell-index = <4>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac\";\n"
  "> +\t\treg = <0xe8000 0x1000>;\n"
@@ -679,13 +686,13 @@
  "> +\t\tpcsphy-handle = <&pcsphy4>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tmdio at e9000 {\n"
+ "> +\tmdio@e9000 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac-mdio\", \"fsl,fman-xmdio\";\n"
  "> +\t\treg = <0xe9000 0x1000>;\n"
  "> +\n"
- "> +\t\tpcsphy4: ethernet-phy at 0 {\n"
+ "> +\t\tpcsphy4: ethernet-phy@0 {\n"
  "> +\t\t\treg = <0x0>;\n"
  "> +\t\t};\n"
  "> +\t};\n"
@@ -704,20 +711,20 @@
  "> + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)\n"
  "> + */\n"
  "> +\n"
- "> +fman at 1a00000 {\n"
- "> +\tfman0_rx_0x0d: port at 8d000 {\n"
+ "> +fman@1a00000 {\n"
+ "> +\tfman0_rx_0x0d: port@8d000 {\n"
  "> +\t\tcell-index = <0xd>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-rx\";\n"
  "> +\t\treg = <0x8d000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfman0_tx_0x2d: port at ad000 {\n"
+ "> +\tfman0_tx_0x2d: port@ad000 {\n"
  "> +\t\tcell-index = <0x2d>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-tx\";\n"
  "> +\t\treg = <0xad000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tethernet at ea000 {\n"
+ "> +\tethernet@ea000 {\n"
  "> +\t\tcell-index = <5>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac\";\n"
  "> +\t\treg = <0xea000 0x1000>;\n"
@@ -726,13 +733,13 @@
  "> +\t\tpcsphy-handle = <&pcsphy5>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tmdio at eb000 {\n"
+ "> +\tmdio@eb000 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac-mdio\", \"fsl,fman-xmdio\";\n"
  "> +\t\treg = <0xeb000 0x1000>;\n"
  "> +\n"
- "> +\t\tpcsphy5: ethernet-phy at 0 {\n"
+ "> +\t\tpcsphy5: ethernet-phy@0 {\n"
  "> +\t\t\treg = <0x0>;\n"
  "> +\t\t};\n"
  "> +\t};\n"
@@ -751,7 +758,7 @@
  "> + * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)\n"
  "> + */\n"
  "> +\n"
- "> +fman0: fman at 1a00000 {\n"
+ "> +fman0: fman@1a00000 {\n"
  "> +\t#address-cells = <1>;\n"
  "> +\t#size-cells = <1>;\n"
  "> +\tcell-index = <0>;\n"
@@ -763,62 +770,62 @@
  "> +\tclock-names = \"fmanclk\";\n"
  "> +\tfsl,qman-channel-range = <0x800 0x10>;\n"
  "> +\n"
- "> +\tmuram at 0 {\n"
+ "> +\tmuram@0 {\n"
  "> +\t\tcompatible = \"fsl,fman-muram\";\n"
  "> +\t\treg = <0x0 0x60000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfman0_oh_0x2: port at 82000 {\n"
+ "> +\tfman0_oh_0x2: port@82000 {\n"
  "> +\t\tcell-index = <0x2>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-oh\";\n"
  "> +\t\treg = <0x82000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfman0_oh_0x3: port at 83000 {\n"
+ "> +\tfman0_oh_0x3: port@83000 {\n"
  "> +\t\tcell-index = <0x3>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-oh\";\n"
  "> +\t\treg = <0x83000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfman0_oh_0x4: port at 84000 {\n"
+ "> +\tfman0_oh_0x4: port@84000 {\n"
  "> +\t\tcell-index = <0x4>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-oh\";\n"
  "> +\t\treg = <0x84000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfman0_oh_0x5: port at 85000 {\n"
+ "> +\tfman0_oh_0x5: port@85000 {\n"
  "> +\t\tcell-index = <0x5>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-oh\";\n"
  "> +\t\treg = <0x85000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfman0_oh_0x6: port at 86000 {\n"
+ "> +\tfman0_oh_0x6: port@86000 {\n"
  "> +\t\tcell-index = <0x6>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-oh\";\n"
  "> +\t\treg = <0x86000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfman0_oh_0x7: port at 87000 {\n"
+ "> +\tfman0_oh_0x7: port@87000 {\n"
  "> +\t\tcell-index = <0x7>;\n"
  "> +\t\tcompatible = \"fsl,fman-v3-port-oh\";\n"
  "> +\t\treg = <0x87000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tmdio0: mdio at fc000 {\n"
+ "> +\tmdio0: mdio@fc000 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac-mdio\", \"fsl,fman-xmdio\";\n"
  "> +\t\treg = <0xfc000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\txmdio0: mdio at fd000 {\n"
+ "> +\txmdio0: mdio@fd000 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\t\tcompatible = \"fsl,fman-memac-mdio\", \"fsl,fman-xmdio\";\n"
  "> +\t\treg = <0xfd000 0x1000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tptp_timer0: ptp-timer at fe000 {\n"
+ "> +\tptp_timer0: ptp-timer@fe000 {\n"
  "> +\t\tcompatible = \"fsl,fman-ptp-timer\";\n"
  "> +\t\treg = <0xfe000 0x1000>;\n"
  "> +\t};\n"
@@ -842,63 +849,63 @@
  "> +\t#size-cells = <1>;\n"
  "> +\tcompatible = \"simple-bus\";\n"
  "> +\n"
- "> +\tqportal0: qman-portal at 0 {\n"
+ "> +\tqportal0: qman-portal@0 {\n"
  "> +\t\tcompatible = \"fsl,qman-portal\";\n"
  "> +\t\treg = <0x0 0x4000 0x4000000 0x4000>;\n"
  "> +\t\tinterrupts = <0 172 0x4>;\n"
  "> +\t\tcell-index = <0>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tqportal1: qman-portal at 10000 {\n"
+ "> +\tqportal1: qman-portal@10000 {\n"
  "> +\t\tcompatible = \"fsl,qman-portal\";\n"
  "> +\t\treg = <0x10000 0x4000 0x4010000 0x4000>;\n"
  "> +\t\tinterrupts = <0 174 0x4>;\n"
  "> +\t\tcell-index = <1>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tqportal2: qman-portal at 20000 {\n"
+ "> +\tqportal2: qman-portal@20000 {\n"
  "> +\t\tcompatible = \"fsl,qman-portal\";\n"
  "> +\t\treg = <0x20000 0x4000 0x4020000 0x4000>;\n"
  "> +\t\tinterrupts = <0 176 0x4>;\n"
  "> +\t\tcell-index = <2>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tqportal3: qman-portal at 30000 {\n"
+ "> +\tqportal3: qman-portal@30000 {\n"
  "> +\t\tcompatible = \"fsl,qman-portal\";\n"
  "> +\t\treg = <0x30000 0x4000 0x4030000 0x4000>;\n"
  "> +\t\tinterrupts = <0 178 0x4>;\n"
  "> +\t\tcell-index = <3>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tqportal4: qman-portal at 40000 {\n"
+ "> +\tqportal4: qman-portal@40000 {\n"
  "> +\t\tcompatible = \"fsl,qman-portal\";\n"
  "> +\t\treg = <0x40000 0x4000 0x4040000 0x4000>;\n"
  "> +\t\tinterrupts = <0 180 0x4>;\n"
  "> +\t\tcell-index = <4>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tqportal5: qman-portal at 50000 {\n"
+ "> +\tqportal5: qman-portal@50000 {\n"
  "> +\t\tcompatible = \"fsl,qman-portal\";\n"
  "> +\t\treg = <0x50000 0x4000 0x4050000 0x4000>;\n"
  "> +\t\tinterrupts = <0 182 0x4>;\n"
  "> +\t\tcell-index = <5>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tqportal6: qman-portal at 60000 {\n"
+ "> +\tqportal6: qman-portal@60000 {\n"
  "> +\t\tcompatible = \"fsl,qman-portal\";\n"
  "> +\t\treg = <0x60000 0x4000 0x4060000 0x4000>;\n"
  "> +\t\tinterrupts = <0 184 0x4>;\n"
  "> +\t\tcell-index = <6>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tqportal7: qman-portal at 70000 {\n"
+ "> +\tqportal7: qman-portal@70000 {\n"
  "> +\t\tcompatible = \"fsl,qman-portal\";\n"
  "> +\t\treg = <0x70000 0x4000 0x4070000 0x4000>;\n"
  "> +\t\tinterrupts = <0 186 0x4>;\n"
  "> +\t\tcell-index = <7>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tqportal8: qman-portal at 80000 {\n"
+ "> +\tqportal8: qman-portal@80000 {\n"
  "> +\t\tcompatible = \"fsl,qman-portal\";\n"
  "> +\t\treg = <0x80000 0x4000 0x4080000 0x4000>;\n"
  "> +\t\tinterrupts = <0 188 0x4>;\n"
@@ -911,7 +918,7 @@
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel at lists.infradead.org\n"
+ "> linux-arm-kernel@lists.infradead.org\n"
  > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-e7c65909eae9d2fd1ea81366f7680c3e437e29f38ef9988d28168a069452e85f
+00049f456f1793c0b209c6de4546c731ab3deba35dd98447604219d296df637f
