diff options
| author |   yankejian <yankejian@huawei.com> | 2015-10-27 19:16:34 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-27 20:20:24 -0700 |
| commit | 6d08f617872cc048173d59f1ce4660b030bab5a6 (patch) | |
| tree | 868e7745bb7d7812002418429d9a5c65584df8ff | |
| parent | net: hns: fixes the bug tested XGE by ethtool -p (diff) | |
| download | linux-dev-6d08f617872cc048173d59f1ce4660b030bab5a6.tar.xz linux-dev-6d08f617872cc048173d59f1ce4660b030bab5a6.zip | |
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>
| -rw-r--r-- | Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt index 9940aa02b8bd..9c23fdf25018 100644 --- 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 35005866a34e..606dd5a05c2d 100644 --- 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 |