From: huangdaode <huangdaode@hisilicon.com>
To: <davem@davemloft.net>, <robh+dt@kernel.org>
Cc: mark.rutland@arm.com, devicetree@vger.kernel.org,
salil.mehta@huawei.com, kenneth-lee-2012@foxmail.com,
pawel.moll@arm.com, ijc+devicetree@hellion.org.uk,
catalin.marinas@arm.com, lipeng321@huawei.com,
will.deacon@arm.com, linux-kernel@vger.kernel.org,
xuwei5@hisilicon.com, linuxarm@huawei.com,
Yisen.Zhuang@huawei.com, huangdaode@hisilicon.com,
galak@codeaurora.org, lisheng011@huawei.com,
liguozhu@hisilicon.com, netdev@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH RESEND v2 net-next] net: hisilicon: updates HNS config and documents
Date: Tue, 27 Oct 2015 19:16:34 +0800 [thread overview]
Message-ID: <1445944594-244149-1-git-send-email-huangdaode@hisilicon.com> (raw)
From: yankejian <yankejian@huawei.com>
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>
---
Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt | 2 +-
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 9940aa0..9c23fdf 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 3500586..606dd5a 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
--
1.9.1
next reply other threads:[~2015-10-27 11:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-27 11:16 huangdaode [this message]
2015-10-28 3:20 ` [PATCH RESEND v2 net-next] net: hisilicon: updates HNS config and documents David Miller
2015-10-30 14:20 ` Arnd Bergmann
2015-10-31 1:40 ` huangdaode
[not found] ` <56341C00.8080303-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
2015-10-31 2:18 ` Salil Mehta
2015-11-02 22:05 ` Arnd Bergmann
2015-11-12 2:11 ` huangdaode
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445944594-244149-1-git-send-email-huangdaode@hisilicon.com \
--to=huangdaode@hisilicon.com \
--cc=Yisen.Zhuang@huawei.com \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=kenneth-lee-2012@foxmail.com \
--cc=liguozhu@hisilicon.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=lipeng321@huawei.com \
--cc=lisheng011@huawei.com \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=salil.mehta@huawei.com \
--cc=will.deacon@arm.com \
--cc=xuwei5@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).