diff for duplicates of <56970F48.9060504@huawei.com> diff --git a/a/1.txt b/N1/1.txt index 76d0b82..39b5e66 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ -? 2016/1/13 11:14, Kejian Yan ??: +在 2016/1/13 11:14, Kejian Yan 写道: > This patch replace the assoication between dsaf and enet from string > matching to object reference. It requires the DTS to be updated within > BIOS. Thanks god it can be done for all released boards. @@ -56,8 +56,8 @@ Yisen > > Example: > -> -dsa: dsa at c7000000 { -> +dsaf0: dsa at c7000000 { +> -dsa: dsa@c7000000 { +> +dsaf0: dsa@c7000000 { > compatible = "hisilicon,hns-dsaf-v1"; > - dsa_name = "dsaf0"; > mode = "6port-16rss"; @@ -81,7 +81,7 @@ Yisen > are called debug ports. > @@ -41,7 +42,7 @@ Example: > -> ethernet at 0{ +> ethernet@0{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; @@ -92,29 +92,29 @@ Yisen > index 606dd5a..89c883e 100644 > --- a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi > +++ b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi -> @@ -23,9 +23,8 @@ soc0: soc at 000000000 { +> @@ -23,9 +23,8 @@ soc0: soc@000000000 { > }; > }; > -> - dsa: dsa at c7000000 { -> + dsaf0: dsa at c7000000 { +> - dsa: dsa@c7000000 { +> + dsaf0: dsa@c7000000 { > compatible = "hisilicon,hns-dsaf-v1"; > - dsa_name = "dsaf0"; > mode = "6port-16rss"; > interrupt-parent = <&mbigen_dsa>; > -> @@ -127,7 +126,7 @@ soc0: soc at 000000000 { +> @@ -127,7 +126,7 @@ soc0: soc@000000000 { > -> eth0: ethernet at 0{ +> eth0: ethernet@0{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; > port-id = <0>; > local-mac-address = [00 00 00 01 00 58]; > status = "disabled"; -> @@ -135,14 +134,14 @@ soc0: soc at 000000000 { +> @@ -135,14 +134,14 @@ soc0: soc@000000000 { > }; -> eth1: ethernet at 1{ +> eth1: ethernet@1{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; @@ -122,52 +122,52 @@ Yisen > status = "disabled"; > dma-coherent; > }; -> eth2: ethernet at 2{ +> eth2: ethernet@2{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; > port-id = <2>; > local-mac-address = [00 00 00 01 00 5a]; > status = "disabled"; -> @@ -150,7 +149,7 @@ soc0: soc at 000000000 { +> @@ -150,7 +149,7 @@ soc0: soc@000000000 { > }; -> eth3: ethernet at 3{ +> eth3: ethernet@3{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; > port-id = <3>; > local-mac-address = [00 00 00 01 00 5b]; > status = "disabled"; -> @@ -158,7 +157,7 @@ soc0: soc at 000000000 { +> @@ -158,7 +157,7 @@ soc0: soc@000000000 { > }; -> eth4: ethernet at 4{ +> eth4: ethernet@4{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; > port-id = <4>; > local-mac-address = [00 00 00 01 00 5c]; > status = "disabled"; -> @@ -166,7 +165,7 @@ soc0: soc at 000000000 { +> @@ -166,7 +165,7 @@ soc0: soc@000000000 { > }; -> eth5: ethernet at 5{ +> eth5: ethernet@5{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; > port-id = <5>; > local-mac-address = [00 00 00 01 00 5d]; > status = "disabled"; -> @@ -174,7 +173,7 @@ soc0: soc at 000000000 { +> @@ -174,7 +173,7 @@ soc0: soc@000000000 { > }; -> eth6: ethernet at 6{ +> eth6: ethernet@6{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; > port-id = <6>; > local-mac-address = [00 00 00 01 00 5e]; > status = "disabled"; -> @@ -182,7 +181,7 @@ soc0: soc at 000000000 { +> @@ -182,7 +181,7 @@ soc0: soc@000000000 { > }; -> eth7: ethernet at 7{ +> eth7: ethernet@7{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; diff --git a/a/content_digest b/N1/content_digest index f24ee3a..64b7268 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,33 @@ "ref\01452654880-28980-1-git-send-email-yankejian@huawei.com\0" - "From\0Yisen.zhuang@huawei.com (Yisen Zhuang)\0" - "Subject\0[PATCH v2 next-next] net: hns: enet specifies a reference to dsaf\0" + "From\0Yisen Zhuang <Yisen.zhuang@huawei.com>\0" + "Subject\0Re: [PATCH v2 next-next] net: hns: enet specifies a reference to dsaf\0" "Date\0Thu, 14 Jan 2016 11:00:24 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Kejian Yan <yankejian@huawei.com>" + davem@davemloft.net + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + catalin.marinas@arm.com + will.deacon@arm.com + huangdaode@hisilicon.com + liguozhu@huawei.com + arnd@arndb.de + fengguang.wu@intel.com + salil.mehta@huawei.com + andriy.shevchenko@linux.intel.com + " lisheng011@huawei.com\0" + "Cc\0devicetree@vger.kernel.org" + netdev@vger.kernel.org + linuxarm@huawei.com + linux-kernel@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\n" "\n" - "? 2016/1/13 11:14, Kejian Yan ??:\n" + "\345\234\250 2016/1/13 11:14, Kejian Yan \345\206\231\351\201\223:\n" "> This patch replace the assoication between dsaf and enet from string\n" "> matching to object reference. It requires the DTS to be updated within\n" "> BIOS. Thanks god it can be done for all released boards.\n" @@ -63,8 +83,8 @@ "> \n" "> Example:\n" "> \n" - "> -dsa: dsa at c7000000 {\n" - "> +dsaf0: dsa at c7000000 {\n" + "> -dsa: dsa@c7000000 {\n" + "> +dsaf0: dsa@c7000000 {\n" "> \tcompatible = \"hisilicon,hns-dsaf-v1\";\n" "> -\tdsa_name = \"dsaf0\";\n" "> \tmode = \"6port-16rss\";\n" @@ -88,7 +108,7 @@ "> are called debug ports.\n" "> @@ -41,7 +42,7 @@ Example:\n" "> \n" - "> \tethernet at 0{\n" + "> \tethernet@0{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" @@ -99,29 +119,29 @@ "> index 606dd5a..89c883e 100644\n" "> --- a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi\n" "> +++ b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi\n" - "> @@ -23,9 +23,8 @@ soc0: soc at 000000000 {\n" + "> @@ -23,9 +23,8 @@ soc0: soc@000000000 {\n" "> \t\t};\n" "> \t};\n" "> \n" - "> -\tdsa: dsa at c7000000 {\n" - "> +\tdsaf0: dsa at c7000000 {\n" + "> -\tdsa: dsa@c7000000 {\n" + "> +\tdsaf0: dsa@c7000000 {\n" "> \t\tcompatible = \"hisilicon,hns-dsaf-v1\";\n" "> -\t\tdsa_name = \"dsaf0\";\n" "> \t\tmode = \"6port-16rss\";\n" "> \t\tinterrupt-parent = <&mbigen_dsa>;\n" "> \n" - "> @@ -127,7 +126,7 @@ soc0: soc at 000000000 {\n" + "> @@ -127,7 +126,7 @@ soc0: soc@000000000 {\n" "> \n" - "> \teth0: ethernet at 0{\n" + "> \teth0: ethernet@0{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" "> \t\tport-id = <0>;\n" "> \t\tlocal-mac-address = [00 00 00 01 00 58];\n" "> \t\tstatus = \"disabled\";\n" - "> @@ -135,14 +134,14 @@ soc0: soc at 000000000 {\n" + "> @@ -135,14 +134,14 @@ soc0: soc@000000000 {\n" "> \t};\n" - "> \teth1: ethernet at 1{\n" + "> \teth1: ethernet@1{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" @@ -129,52 +149,52 @@ "> \t\tstatus = \"disabled\";\n" "> \t\tdma-coherent;\n" "> \t};\n" - "> \teth2: ethernet at 2{\n" + "> \teth2: ethernet@2{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" "> \t\tport-id = <2>;\n" "> \t\tlocal-mac-address = [00 00 00 01 00 5a];\n" "> \t\tstatus = \"disabled\";\n" - "> @@ -150,7 +149,7 @@ soc0: soc at 000000000 {\n" + "> @@ -150,7 +149,7 @@ soc0: soc@000000000 {\n" "> \t};\n" - "> \teth3: ethernet at 3{\n" + "> \teth3: ethernet@3{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" "> \t\tport-id = <3>;\n" "> \t\tlocal-mac-address = [00 00 00 01 00 5b];\n" "> \t\tstatus = \"disabled\";\n" - "> @@ -158,7 +157,7 @@ soc0: soc at 000000000 {\n" + "> @@ -158,7 +157,7 @@ soc0: soc@000000000 {\n" "> \t};\n" - "> \teth4: ethernet at 4{\n" + "> \teth4: ethernet@4{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" "> \t\tport-id = <4>;\n" "> \t\tlocal-mac-address = [00 00 00 01 00 5c];\n" "> \t\tstatus = \"disabled\";\n" - "> @@ -166,7 +165,7 @@ soc0: soc at 000000000 {\n" + "> @@ -166,7 +165,7 @@ soc0: soc@000000000 {\n" "> \t};\n" - "> \teth5: ethernet at 5{\n" + "> \teth5: ethernet@5{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" "> \t\tport-id = <5>;\n" "> \t\tlocal-mac-address = [00 00 00 01 00 5d];\n" "> \t\tstatus = \"disabled\";\n" - "> @@ -174,7 +173,7 @@ soc0: soc at 000000000 {\n" + "> @@ -174,7 +173,7 @@ soc0: soc@000000000 {\n" "> \t};\n" - "> \teth6: ethernet at 6{\n" + "> \teth6: ethernet@6{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" "> \t\tport-id = <6>;\n" "> \t\tlocal-mac-address = [00 00 00 01 00 5e];\n" "> \t\tstatus = \"disabled\";\n" - "> @@ -182,7 +181,7 @@ soc0: soc at 000000000 {\n" + "> @@ -182,7 +181,7 @@ soc0: soc@000000000 {\n" "> \t};\n" - "> \teth7: ethernet at 7{\n" + "> \teth7: ethernet@7{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" @@ -363,4 +383,4 @@ "> \tint phy_mode;\n" > -b568a2400e0402ba7d7eebb1989496d10ae37c0396867b3423967e8727322c01 +9e6ef64db71631862dd3b878259d2831d299a828ed2b4c0287d8ce099af3f075
diff --git a/a/1.txt b/N2/1.txt index 76d0b82..39b5e66 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,6 +1,6 @@ -? 2016/1/13 11:14, Kejian Yan ??: +在 2016/1/13 11:14, Kejian Yan 写道: > This patch replace the assoication between dsaf and enet from string > matching to object reference. It requires the DTS to be updated within > BIOS. Thanks god it can be done for all released boards. @@ -56,8 +56,8 @@ Yisen > > Example: > -> -dsa: dsa at c7000000 { -> +dsaf0: dsa at c7000000 { +> -dsa: dsa@c7000000 { +> +dsaf0: dsa@c7000000 { > compatible = "hisilicon,hns-dsaf-v1"; > - dsa_name = "dsaf0"; > mode = "6port-16rss"; @@ -81,7 +81,7 @@ Yisen > are called debug ports. > @@ -41,7 +42,7 @@ Example: > -> ethernet at 0{ +> ethernet@0{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; @@ -92,29 +92,29 @@ Yisen > index 606dd5a..89c883e 100644 > --- a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi > +++ b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi -> @@ -23,9 +23,8 @@ soc0: soc at 000000000 { +> @@ -23,9 +23,8 @@ soc0: soc@000000000 { > }; > }; > -> - dsa: dsa at c7000000 { -> + dsaf0: dsa at c7000000 { +> - dsa: dsa@c7000000 { +> + dsaf0: dsa@c7000000 { > compatible = "hisilicon,hns-dsaf-v1"; > - dsa_name = "dsaf0"; > mode = "6port-16rss"; > interrupt-parent = <&mbigen_dsa>; > -> @@ -127,7 +126,7 @@ soc0: soc at 000000000 { +> @@ -127,7 +126,7 @@ soc0: soc@000000000 { > -> eth0: ethernet at 0{ +> eth0: ethernet@0{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; > port-id = <0>; > local-mac-address = [00 00 00 01 00 58]; > status = "disabled"; -> @@ -135,14 +134,14 @@ soc0: soc at 000000000 { +> @@ -135,14 +134,14 @@ soc0: soc@000000000 { > }; -> eth1: ethernet at 1{ +> eth1: ethernet@1{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; @@ -122,52 +122,52 @@ Yisen > status = "disabled"; > dma-coherent; > }; -> eth2: ethernet at 2{ +> eth2: ethernet@2{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; > port-id = <2>; > local-mac-address = [00 00 00 01 00 5a]; > status = "disabled"; -> @@ -150,7 +149,7 @@ soc0: soc at 000000000 { +> @@ -150,7 +149,7 @@ soc0: soc@000000000 { > }; -> eth3: ethernet at 3{ +> eth3: ethernet@3{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; > port-id = <3>; > local-mac-address = [00 00 00 01 00 5b]; > status = "disabled"; -> @@ -158,7 +157,7 @@ soc0: soc at 000000000 { +> @@ -158,7 +157,7 @@ soc0: soc@000000000 { > }; -> eth4: ethernet at 4{ +> eth4: ethernet@4{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; > port-id = <4>; > local-mac-address = [00 00 00 01 00 5c]; > status = "disabled"; -> @@ -166,7 +165,7 @@ soc0: soc at 000000000 { +> @@ -166,7 +165,7 @@ soc0: soc@000000000 { > }; -> eth5: ethernet at 5{ +> eth5: ethernet@5{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; > port-id = <5>; > local-mac-address = [00 00 00 01 00 5d]; > status = "disabled"; -> @@ -174,7 +173,7 @@ soc0: soc at 000000000 { +> @@ -174,7 +173,7 @@ soc0: soc@000000000 { > }; -> eth6: ethernet at 6{ +> eth6: ethernet@6{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; > port-id = <6>; > local-mac-address = [00 00 00 01 00 5e]; > status = "disabled"; -> @@ -182,7 +181,7 @@ soc0: soc at 000000000 { +> @@ -182,7 +181,7 @@ soc0: soc@000000000 { > }; -> eth7: ethernet at 7{ +> eth7: ethernet@7{ > compatible = "hisilicon,hns-nic-v1"; > - ae-name = "dsaf0"; > + ae-handle = <&dsaf0>; diff --git a/a/content_digest b/N2/content_digest index f24ee3a..54d528a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,33 @@ "ref\01452654880-28980-1-git-send-email-yankejian@huawei.com\0" - "From\0Yisen.zhuang@huawei.com (Yisen Zhuang)\0" - "Subject\0[PATCH v2 next-next] net: hns: enet specifies a reference to dsaf\0" + "From\0Yisen Zhuang <Yisen.zhuang@huawei.com>\0" + "Subject\0Re: [PATCH v2 next-next] net: hns: enet specifies a reference to dsaf\0" "Date\0Thu, 14 Jan 2016 11:00:24 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Kejian Yan <yankejian@huawei.com>" + <davem@davemloft.net> + <robh+dt@kernel.org> + <pawel.moll@arm.com> + <mark.rutland@arm.com> + <ijc+devicetree@hellion.org.uk> + <galak@codeaurora.org> + <catalin.marinas@arm.com> + <will.deacon@arm.com> + <huangdaode@hisilicon.com> + <liguozhu@huawei.com> + <arnd@arndb.de> + <fengguang.wu@intel.com> + <salil.mehta@huawei.com> + <andriy.shevchenko@linux.intel.com> + " <lisheng011@huawei.com>\0" + "Cc\0<devicetree@vger.kernel.org>" + <netdev@vger.kernel.org> + <linuxarm@huawei.com> + <linux-kernel@vger.kernel.org> + " <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "\n" "\n" - "? 2016/1/13 11:14, Kejian Yan ??:\n" + "\345\234\250 2016/1/13 11:14, Kejian Yan \345\206\231\351\201\223:\n" "> This patch replace the assoication between dsaf and enet from string\n" "> matching to object reference. It requires the DTS to be updated within\n" "> BIOS. Thanks god it can be done for all released boards.\n" @@ -63,8 +83,8 @@ "> \n" "> Example:\n" "> \n" - "> -dsa: dsa at c7000000 {\n" - "> +dsaf0: dsa at c7000000 {\n" + "> -dsa: dsa@c7000000 {\n" + "> +dsaf0: dsa@c7000000 {\n" "> \tcompatible = \"hisilicon,hns-dsaf-v1\";\n" "> -\tdsa_name = \"dsaf0\";\n" "> \tmode = \"6port-16rss\";\n" @@ -88,7 +108,7 @@ "> are called debug ports.\n" "> @@ -41,7 +42,7 @@ Example:\n" "> \n" - "> \tethernet at 0{\n" + "> \tethernet@0{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" @@ -99,29 +119,29 @@ "> index 606dd5a..89c883e 100644\n" "> --- a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi\n" "> +++ b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi\n" - "> @@ -23,9 +23,8 @@ soc0: soc at 000000000 {\n" + "> @@ -23,9 +23,8 @@ soc0: soc@000000000 {\n" "> \t\t};\n" "> \t};\n" "> \n" - "> -\tdsa: dsa at c7000000 {\n" - "> +\tdsaf0: dsa at c7000000 {\n" + "> -\tdsa: dsa@c7000000 {\n" + "> +\tdsaf0: dsa@c7000000 {\n" "> \t\tcompatible = \"hisilicon,hns-dsaf-v1\";\n" "> -\t\tdsa_name = \"dsaf0\";\n" "> \t\tmode = \"6port-16rss\";\n" "> \t\tinterrupt-parent = <&mbigen_dsa>;\n" "> \n" - "> @@ -127,7 +126,7 @@ soc0: soc at 000000000 {\n" + "> @@ -127,7 +126,7 @@ soc0: soc@000000000 {\n" "> \n" - "> \teth0: ethernet at 0{\n" + "> \teth0: ethernet@0{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" "> \t\tport-id = <0>;\n" "> \t\tlocal-mac-address = [00 00 00 01 00 58];\n" "> \t\tstatus = \"disabled\";\n" - "> @@ -135,14 +134,14 @@ soc0: soc at 000000000 {\n" + "> @@ -135,14 +134,14 @@ soc0: soc@000000000 {\n" "> \t};\n" - "> \teth1: ethernet at 1{\n" + "> \teth1: ethernet@1{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" @@ -129,52 +149,52 @@ "> \t\tstatus = \"disabled\";\n" "> \t\tdma-coherent;\n" "> \t};\n" - "> \teth2: ethernet at 2{\n" + "> \teth2: ethernet@2{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" "> \t\tport-id = <2>;\n" "> \t\tlocal-mac-address = [00 00 00 01 00 5a];\n" "> \t\tstatus = \"disabled\";\n" - "> @@ -150,7 +149,7 @@ soc0: soc at 000000000 {\n" + "> @@ -150,7 +149,7 @@ soc0: soc@000000000 {\n" "> \t};\n" - "> \teth3: ethernet at 3{\n" + "> \teth3: ethernet@3{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" "> \t\tport-id = <3>;\n" "> \t\tlocal-mac-address = [00 00 00 01 00 5b];\n" "> \t\tstatus = \"disabled\";\n" - "> @@ -158,7 +157,7 @@ soc0: soc at 000000000 {\n" + "> @@ -158,7 +157,7 @@ soc0: soc@000000000 {\n" "> \t};\n" - "> \teth4: ethernet at 4{\n" + "> \teth4: ethernet@4{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" "> \t\tport-id = <4>;\n" "> \t\tlocal-mac-address = [00 00 00 01 00 5c];\n" "> \t\tstatus = \"disabled\";\n" - "> @@ -166,7 +165,7 @@ soc0: soc at 000000000 {\n" + "> @@ -166,7 +165,7 @@ soc0: soc@000000000 {\n" "> \t};\n" - "> \teth5: ethernet at 5{\n" + "> \teth5: ethernet@5{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" "> \t\tport-id = <5>;\n" "> \t\tlocal-mac-address = [00 00 00 01 00 5d];\n" "> \t\tstatus = \"disabled\";\n" - "> @@ -174,7 +173,7 @@ soc0: soc at 000000000 {\n" + "> @@ -174,7 +173,7 @@ soc0: soc@000000000 {\n" "> \t};\n" - "> \teth6: ethernet at 6{\n" + "> \teth6: ethernet@6{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" "> \t\tport-id = <6>;\n" "> \t\tlocal-mac-address = [00 00 00 01 00 5e];\n" "> \t\tstatus = \"disabled\";\n" - "> @@ -182,7 +181,7 @@ soc0: soc at 000000000 {\n" + "> @@ -182,7 +181,7 @@ soc0: soc@000000000 {\n" "> \t};\n" - "> \teth7: ethernet at 7{\n" + "> \teth7: ethernet@7{\n" "> \t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> -\t\tae-name = \"dsaf0\";\n" "> +\t\tae-handle = <&dsaf0>;\n" @@ -363,4 +383,4 @@ "> \tint phy_mode;\n" > -b568a2400e0402ba7d7eebb1989496d10ae37c0396867b3423967e8727322c01 +765d627fe73dfaa35496832182da4bef65950f01a11215745f1c38d5fa1cf6ce
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.