diff for duplicates of <560019C5.6030407@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 98e03a5..0b9e049 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -106,7 +106,7 @@ This is a h/w property? > + > +Example: > + -> +dsa: dsa at c7000000 { +> +dsa: dsa@c7000000 { > + compatible = "hisilicon,hns-dsaf-v1"; > + dsa_name = "dsaf0"; > + mode = "6port-16rss"; @@ -149,13 +149,13 @@ Most specific string should come first. > +Typically an MDIO bus might have several children. > + > +Example: -> + mdio at 803c0000 { +> + mdio@803c0000 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "hisilicon,mdio","hisilicon,hns-mdio"; > + reg = <0x0 0x803c0000 0x0 0x10000>; > + -> + ethernet-phy at 0 { +> + ethernet-phy@0 { > + ... > + reg = <0>; > + }; @@ -213,7 +213,7 @@ Could the OF graph binding be used to describe this connection? > + > +Example: > + -> + ethernet at 0{ +> + ethernet@0{ > + compatible = "hisilicon,hns-nic-v1"; > + ae-name = "dsaf0"; > + port-id = <0>; @@ -225,7 +225,7 @@ Could the OF graph binding be used to describe this connection? > --- /dev/null > +++ b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi > @@ -0,0 +1,193 @@ -> +soc0: soc at 000000000 { +> +soc0: soc@000000000 { > + #address-cells = <2>; > + #size-cells = <2>; > + device_type = "soc"; @@ -233,14 +233,14 @@ Could the OF graph binding be used to describe this connection? > + ranges = <0x0 0x0 0x0 0x0 0x1 0x0>; > + chip-id = <0>; > + -> + soc0_mdio0: mdio at 803c0000 { +> + soc0_mdio0: mdio@803c0000 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "hisilicon,hns-mdio"; > + reg = <0x0 0x803c0000 0x0 0x10000 > + 0x0 0x80000000 0x0 0x10000>; > + -> + soc0_phy4: ethernet-phy at 4 { +> + soc0_phy4: ethernet-phy@4 { > + reg = <0x0>; Should be 4? @@ -251,7 +251,7 @@ Drop device_type. > + compatible = "ethernet-phy-ieee802.3-c22"; > + }; -> + soc0_phy5: ethernet-phy at 5 { +> + soc0_phy5: ethernet-phy@5 { > + reg = <0x1>; Should be 5? Or unit-address should be 1. @@ -261,7 +261,7 @@ Should be 5? Or unit-address should be 1. > + }; > + }; > + -> + dsa: dsa at c7000000 { +> + dsa: dsa@c7000000 { > + compatible = "hisilicon,hns-dsaf-v1"; > + dsa_name = "dsaf0"; > + mode = "6port-16rss"; @@ -363,7 +363,7 @@ Should be 5? Or unit-address should be 1. > + dma-coherent; > + }; > + -> + eth0: ethernet at 0{ +> + eth0: ethernet@0{ > + compatible = "hisilicon,hns-nic-v1"; > + ae-name = "dsaf0"; > + port-id = <0>; @@ -380,14 +380,14 @@ There is no register interface for these? Is this really per port? > + }; -> + eth1: ethernet at 1{ +> + eth1: ethernet@1{ > + compatible = "hisilicon,hns-nic-v1"; > + ae-name = "dsaf0"; > + port-id = <1>; > + status = "disabled"; > + dma-coherent; > + }; -> + eth2: ethernet at 2{ +> + eth2: ethernet@2{ > + compatible = "hisilicon,hns-nic-v1"; > + ae-name = "dsaf0"; > + port-id = <2>; @@ -395,7 +395,7 @@ Is this really per port? > + status = "disabled"; > + dma-coherent; > + }; -> + eth3: ethernet at 3{ +> + eth3: ethernet@3{ > + compatible = "hisilicon,hns-nic-v1"; > + ae-name = "dsaf0"; > + port-id = <3>; @@ -403,7 +403,7 @@ Is this really per port? > + status = "disabled"; > + dma-coherent; > + }; -> + eth4: ethernet at 4{ +> + eth4: ethernet@4{ > + compatible = "hisilicon,hns-nic-v1"; > + ae-name = "dsaf0"; > + port-id = <4>; @@ -411,7 +411,7 @@ Is this really per port? > + status = "disabled"; > + dma-coherent; > + }; -> + eth5: ethernet at 5{ +> + eth5: ethernet@5{ > + compatible = "hisilicon,hns-nic-v1"; > + ae-name = "dsaf0"; > + port-id = <5>; @@ -419,7 +419,7 @@ Is this really per port? > + status = "disabled"; > + dma-coherent; > + }; -> + eth6: ethernet at 6{ +> + eth6: ethernet@6{ > + compatible = "hisilicon,hns-nic-v1"; > + ae-name = "dsaf0"; > + port-id = <6>; @@ -427,7 +427,7 @@ Is this really per port? > + status = "disabled"; > + dma-coherent; > + }; -> + eth7: ethernet at 7{ +> + eth7: ethernet@7{ > + compatible = "hisilicon,hns-nic-v1"; > + ae-name = "dsaf0"; > + port-id = <7>; diff --git a/a/content_digest b/N1/content_digest index bc904bf..40dccee 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,30 @@ "ref\01442472710-20909-1-git-send-email-huangdaode@hisilicon.com\0" "ref\01442472710-20909-2-git-send-email-huangdaode@hisilicon.com\0" - "From\0robh@kernel.org (Rob Herring)\0" - "Subject\0[PATCH v2 1/5] net: add Hisilicon Network Subsystem support (config and documents)\0" + "From\0Rob Herring <robh@kernel.org>\0" + "Subject\0Re: [PATCH v2 1/5] net: add Hisilicon Network Subsystem support (config and documents)\0" "Date\0Mon, 21 Sep 2015 09:52:53 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0huangdaode <huangdaode@hisilicon.com>\0" + "Cc\0pawel.moll@arm.com" + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + catalin.marinas@arm.com + will.deacon@arm.com + liguozhu@hisilicon.com + Yisen.Zhuang@huawei.com + davem@davemloft.net + paul.gortmaker@windriver.com + dingtianhong@huawei.com + zhangfei.gao@linaro.org + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + netdev@vger.kernel.org + linuxarm@huawei.com + salil.mehta@huawei.com + kenneth-lee-2012@foxmail.com + xuwei5@hisilicon.com + " lisheng011@huawei.com\0" "\00:1\0" "b\0" "On 09/17/2015 01:51 AM, huangdaode wrote:\n" @@ -114,7 +135,7 @@ "> +\n" "> +Example:\n" "> +\n" - "> +dsa: dsa at c7000000 {\n" + "> +dsa: dsa@c7000000 {\n" "> +\tcompatible = \"hisilicon,hns-dsaf-v1\";\n" "> +\tdsa_name = \"dsaf0\";\n" "> +\tmode = \"6port-16rss\";\n" @@ -157,13 +178,13 @@ "> +Typically an MDIO bus might have several children.\n" "> +\n" "> +Example:\n" - "> + mdio at 803c0000 {\n" + "> + mdio@803c0000 {\n" "> + #address-cells = <1>;\n" "> + #size-cells = <0>;\n" "> + compatible = \"hisilicon,mdio\",\"hisilicon,hns-mdio\";\n" "> + reg = <0x0 0x803c0000 0x0 0x10000>;\n" "> +\n" - "> + ethernet-phy at 0 {\n" + "> + ethernet-phy@0 {\n" "> + ...\n" "> + reg = <0>;\n" "> + };\n" @@ -221,7 +242,7 @@ "> +\n" "> +Example:\n" "> +\n" - "> +\tethernet at 0{\n" + "> +\tethernet@0{\n" "> +\t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> +\t\tae-name = \"dsaf0\";\n" "> +\t\tport-id = <0>;\n" @@ -233,7 +254,7 @@ "> --- /dev/null\n" "> +++ b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi\n" "> @@ -0,0 +1,193 @@\n" - "> +soc0: soc at 000000000 {\n" + "> +soc0: soc@000000000 {\n" "> +\t#address-cells = <2>;\n" "> +\t#size-cells = <2>;\n" "> +\tdevice_type = \"soc\";\n" @@ -241,14 +262,14 @@ "> +\tranges = <0x0 0x0 0x0 0x0 0x1 0x0>;\n" "> +\tchip-id = <0>;\n" "> +\n" - "> +\tsoc0_mdio0: mdio at 803c0000 {\n" + "> +\tsoc0_mdio0: mdio@803c0000 {\n" "> +\t\t#address-cells = <1>;\n" "> +\t\t#size-cells = <0>;\n" "> +\t\tcompatible = \"hisilicon,hns-mdio\";\n" "> +\t\treg = <0x0 0x803c0000 0x0 0x10000\n" "> +\t\t 0x0 0x80000000 0x0 0x10000>;\n" "> +\n" - "> +\t\tsoc0_phy4: ethernet-phy at 4 {\n" + "> +\t\tsoc0_phy4: ethernet-phy@4 {\n" "> +\t\t\treg = <0x0>;\n" "\n" "Should be 4?\n" @@ -259,7 +280,7 @@ "\n" "> +\t\t\tcompatible = \"ethernet-phy-ieee802.3-c22\";\n" "> +\t\t};\n" - "> +\t\tsoc0_phy5: ethernet-phy at 5 {\n" + "> +\t\tsoc0_phy5: ethernet-phy@5 {\n" "> +\t\t\treg = <0x1>;\n" "\n" "Should be 5? Or unit-address should be 1.\n" @@ -269,7 +290,7 @@ "> +\t\t};\n" "> +\t};\n" "> +\n" - "> +\tdsa: dsa at c7000000 {\n" + "> +\tdsa: dsa@c7000000 {\n" "> +\t\tcompatible = \"hisilicon,hns-dsaf-v1\";\n" "> +\t\tdsa_name = \"dsaf0\";\n" "> +\t\tmode = \"6port-16rss\";\n" @@ -371,7 +392,7 @@ "> +\t\tdma-coherent;\n" "> +\t};\n" "> +\n" - "> +\teth0: ethernet at 0{\n" + "> +\teth0: ethernet@0{\n" "> +\t\tcompatible = \"hisilicon,hns-nic-v1\";\n" "> +\t\tae-name = \"dsaf0\";\n" "> +\t\tport-id = <0>;\n" @@ -388,14 +409,14 @@ "Is this really per port?\n" "\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\tport-id = <1>;\n" "> +\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\tport-id = <2>;\n" @@ -403,7 +424,7 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t\tdma-coherent;\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\tport-id = <3>;\n" @@ -411,7 +432,7 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t\tdma-coherent;\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\tport-id = <4>;\n" @@ -419,7 +440,7 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t\tdma-coherent;\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\tport-id = <5>;\n" @@ -427,7 +448,7 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t\tdma-coherent;\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\tport-id = <6>;\n" @@ -435,7 +456,7 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t\tdma-coherent;\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\tport-id = <7>;\n" @@ -446,4 +467,4 @@ "> +};\n" > -4712013f56d6a2ab31c65079b2b16a32b2137ae5545a99209fd39b13d8286763 +593c157ca0b49ad106284b7c4c8ccfdcf5e80f48fee2b08e8903a3e6d7a3900d
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.