net: hisilicon: updates HNS config and documents

updates the bindings documents and dtsi file according to the review
comments[https://lkml.org/lkml/2015/9/21/670] from Rob Herring <robh@kernel.org>

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: yankejian <yankejian@huawei.com>
Signed-off-by: huangdaode <huangdaode@hisilicon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt
index 9940aa02b8bd5a05a16600c38bf1d503a61e7046..9c23fdf25018ba7b6b8a87fd41653f216c908167 100644 (file)
--- a/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt
+++ b/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt
@@ -12,7 +12,7 @@ Example:
          mdio@803c0000 {
                    #address-cells = <1>;
                    #size-cells = <0>;
-                   compatible = "hisilicon,mdio","hisilicon,hns-mdio";
+                   compatible = "hisilicon,hns-mdio","hisilicon,mdio";
                    reg = <0x0 0x803c0000 0x0 0x10000>;
 
                    ethernet-phy@0 {

diff --git a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi
index 35005866a34ea87daa7093772028cfe0eab55158..606dd5a05c2dfd5682c1343fd05a0ce33b2dd46a 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi
@@ -13,14 +13,12 @@ soc0: soc@000000000 {
                reg = <0x0 0x803c0000 0x0 0x10000
                       0x0 0x80000000 0x0 0x10000>;
 
-               soc0_phy4: ethernet-phy@4 {
+               soc0_phy0: ethernet-phy@0 {
                        reg = <0x0>;
-                       device_type = "ethernet-phy";
                        compatible = "ethernet-phy-ieee802.3-c22";
                };
-               soc0_phy5: ethernet-phy@5 {
+               soc0_phy1: ethernet-phy@1 {
                        reg = <0x1>;
-                       device_type = "ethernet-phy";
                        compatible = "ethernet-phy-ieee802.3-c22";
                };
        };
@@ -37,7 +35,7 @@ soc0: soc@000000000 {
                       0x0 0xc7000000 0x0 0x60000
                       >;
 
-               phy-handle = <0 0 0 0 &soc0_phy4 &soc0_phy5 0 0>;
+               phy-handle = <0 0 0 0 &soc0_phy0 &soc0_phy1 0 0>;
                interrupts = <
                        /* [14] ge fifo err 8 / xge 6**/
                        149 0x4 150 0x4 151 0x4 152 0x4