diff for duplicates of <5666CB31.6090109@huawei.com> diff --git a/a/1.txt b/N1/1.txt index 86d2ab8..4521da9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,11 +4,11 @@ On 2015/12/7 22:12, Rob Herring wrote: > On Sat, Dec 05, 2015 at 03:59:16PM +0800, yankejian wrote: >> when enet specisies a reference to dsaf, the correlative config and > s/when/When/ -ok?i will pay attention to it on patch v3. +ok，i will pay attention to it on patch v3. thanks. >> documents needs to update. this patch updates the correlative dtsi file > s/this/This/ -ok?i will pay attention to it on patch v3. +ok，i will pay attention to it on patch v3. thanks. >> and bindings documents . > ^ @@ -18,7 +18,7 @@ thanks. > so maybe it doesn't matter, but you should be explicit that you are > doing that. > -ok?i will pay attention to it on patch v3. +ok，i will pay attention to it on patch v3. thanks. >> Signed-off-by: yankejian <yankejian@huawei.com> >> --- @@ -44,8 +44,8 @@ thanks. >> >> 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"; @@ -69,7 +69,7 @@ thanks. >> 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>; @@ -80,29 +80,29 @@ thanks. >> 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>; @@ -110,52 +110,52 @@ thanks. >> 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 9866626..aaed978 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,31 @@ "ref\01449302356-54658-1-git-send-email-yankejian@huawei.com\0" "ref\01449302356-54658-3-git-send-email-yankejian@huawei.com\0" "ref\020151207141221.GA18040@rob-hp-laptop\0" - "From\0yankejian@huawei.com (Yankejian (Hackim Yim))\0" - "Subject\0[PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents)\0" + "From\0Yankejian (Hackim Yim) <yankejian@huawei.com>\0" + "Subject\0Re: [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents)\0" "Date\0Tue, 8 Dec 2015 20:21:05 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Rob Herring <robh@kernel.org>\0" + "Cc\0davem@davemloft.net" + arnd@arndb.de + fengguang.wu@intel.com + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + catalin.marinas@arm.com + will.deacon@arm.com + salil.mehta@huawei.com + Yisen.Zhuang@huawei.com + liguozhu@huawei.com + lisheng011@huawei.com + huangdaode@hisilicon.com + xuwei5@hisilicon.com + haifeng.wei@huawei.com + netdev@vger.kernel.org + linux-kernel@vger.kernel.org + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linuxarm@huawei.com\0" "\00:1\0" "b\0" "\n" @@ -13,11 +34,11 @@ "> On Sat, Dec 05, 2015 at 03:59:16PM +0800, yankejian wrote:\n" ">> when enet specisies a reference to dsaf, the correlative config and\n" "> s/when/When/\n" - "ok?i will pay attention to it on patch v3.\n" + "ok\357\274\214i will pay attention to it on patch v3.\n" "thanks.\n" ">> documents needs to update. this patch updates the correlative dtsi file\n" "> s/this/This/\n" - "ok?i will pay attention to it on patch v3.\n" + "ok\357\274\214i will pay attention to it on patch v3.\n" "thanks.\n" ">> and bindings documents .\n" "> ^\n" @@ -27,7 +48,7 @@ "> so maybe it doesn't matter, but you should be explicit that you are \n" "> doing that.\n" ">\n" - "ok?i will pay attention to it on patch v3.\n" + "ok\357\274\214i will pay attention to it on patch v3.\n" "thanks.\n" ">> Signed-off-by: yankejian <yankejian@huawei.com>\n" ">> ---\n" @@ -53,8 +74,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" @@ -78,7 +99,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" @@ -89,29 +110,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" @@ -119,52 +140,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" @@ -177,4 +198,4 @@ "> .\n" > -5d398e8505da6ef700e278e3386f936da44db13da082bc0c236b79497cf361e3 +3050ccccb5b17fdef05c27b0de9af7fe3488cebdfa260e59b668a03e41b5103e
diff --git a/a/1.txt b/N2/1.txt index 86d2ab8..4521da9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -4,11 +4,11 @@ On 2015/12/7 22:12, Rob Herring wrote: > On Sat, Dec 05, 2015 at 03:59:16PM +0800, yankejian wrote: >> when enet specisies a reference to dsaf, the correlative config and > s/when/When/ -ok?i will pay attention to it on patch v3. +ok，i will pay attention to it on patch v3. thanks. >> documents needs to update. this patch updates the correlative dtsi file > s/this/This/ -ok?i will pay attention to it on patch v3. +ok，i will pay attention to it on patch v3. thanks. >> and bindings documents . > ^ @@ -18,7 +18,7 @@ thanks. > so maybe it doesn't matter, but you should be explicit that you are > doing that. > -ok?i will pay attention to it on patch v3. +ok，i will pay attention to it on patch v3. thanks. >> Signed-off-by: yankejian <yankejian@huawei.com> >> --- @@ -44,8 +44,8 @@ thanks. >> >> 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"; @@ -69,7 +69,7 @@ thanks. >> 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>; @@ -80,29 +80,29 @@ thanks. >> 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>; @@ -110,52 +110,52 @@ thanks. >> 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 9866626..518ccde 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,31 @@ "ref\01449302356-54658-1-git-send-email-yankejian@huawei.com\0" "ref\01449302356-54658-3-git-send-email-yankejian@huawei.com\0" "ref\020151207141221.GA18040@rob-hp-laptop\0" - "From\0yankejian@huawei.com (Yankejian (Hackim Yim))\0" - "Subject\0[PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents)\0" + "From\0Yankejian (Hackim Yim) <yankejian@huawei.com>\0" + "Subject\0Re: [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents)\0" "Date\0Tue, 8 Dec 2015 20:21:05 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Rob Herring <robh@kernel.org>\0" + "Cc\0<davem@davemloft.net>" + <arnd@arndb.de> + <fengguang.wu@intel.com> + <pawel.moll@arm.com> + <mark.rutland@arm.com> + <ijc+devicetree@hellion.org.uk> + <galak@codeaurora.org> + <catalin.marinas@arm.com> + <will.deacon@arm.com> + <salil.mehta@huawei.com> + <Yisen.Zhuang@huawei.com> + <liguozhu@huawei.com> + <lisheng011@huawei.com> + <huangdaode@hisilicon.com> + <xuwei5@hisilicon.com> + <haifeng.wei@huawei.com> + <netdev@vger.kernel.org> + <linux-kernel@vger.kernel.org> + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + " <linuxarm@huawei.com>\0" "\00:1\0" "b\0" "\n" @@ -13,11 +34,11 @@ "> On Sat, Dec 05, 2015 at 03:59:16PM +0800, yankejian wrote:\n" ">> when enet specisies a reference to dsaf, the correlative config and\n" "> s/when/When/\n" - "ok?i will pay attention to it on patch v3.\n" + "ok\357\274\214i will pay attention to it on patch v3.\n" "thanks.\n" ">> documents needs to update. this patch updates the correlative dtsi file\n" "> s/this/This/\n" - "ok?i will pay attention to it on patch v3.\n" + "ok\357\274\214i will pay attention to it on patch v3.\n" "thanks.\n" ">> and bindings documents .\n" "> ^\n" @@ -27,7 +48,7 @@ "> so maybe it doesn't matter, but you should be explicit that you are \n" "> doing that.\n" ">\n" - "ok?i will pay attention to it on patch v3.\n" + "ok\357\274\214i will pay attention to it on patch v3.\n" "thanks.\n" ">> Signed-off-by: yankejian <yankejian@huawei.com>\n" ">> ---\n" @@ -53,8 +74,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" @@ -78,7 +99,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" @@ -89,29 +110,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" @@ -119,52 +140,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" @@ -177,4 +198,4 @@ "> .\n" > -5d398e8505da6ef700e278e3386f936da44db13da082bc0c236b79497cf361e3 +e0c40c3d38256f1fcefcc677bddd3811cbd83c9b64be236b7cd25b7630a648fb
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.