From: Dongpo Li <lidongpo@hisilicon.com>
To: <robh+dt@kernel.org>, <mark.rutland@arm.com>,
<mturquette@baylibre.com>, <sboyd@codeaurora.org>,
<linux@armlinux.org.uk>, <zhangfei.gao@linaro.org>,
<yisen.zhuang@huawei.com>, <salil.mehta@huawei.com>,
<davem@davemloft.net>, <arnd@arndb.de>, <andrew@lunn.ch>
Cc: <xuejiancheng@hisilicon.com>, <benjamin.chenhao@hisilicon.com>,
<howell.yang@hisilicon.com>, <netdev@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-clk@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Dongpo Li <lidongpo@hisilicon.com>
Subject: [PATCH 4/4] ARM: dts: hix5hd2: add gmac clock and reset property
Date: Thu, 11 Aug 2016 17:01:55 +0800 [thread overview]
Message-ID: <1470906115-155569-5-git-send-email-lidongpo@hisilicon.com> (raw)
In-Reply-To: <1470906115-155569-1-git-send-email-lidongpo@hisilicon.com>
Add clock and reset property for gmac node.
Signed-off-by: Dongpo Li <lidongpo@hisilicon.com>
---
arch/arm/boot/dts/hisi-x5hd2-dkb.dts | 2 ++
arch/arm/boot/dts/hisi-x5hd2.dtsi | 15 +++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/hisi-x5hd2-dkb.dts b/arch/arm/boot/dts/hisi-x5hd2-dkb.dts
index d13af84..9da9283 100644
--- a/arch/arm/boot/dts/hisi-x5hd2-dkb.dts
+++ b/arch/arm/boot/dts/hisi-x5hd2-dkb.dts
@@ -57,6 +57,7 @@
#size-cells = <0>;
phy-handle = <&phy2>;
phy-mode = "mii";
+ hisilicon,phy-reset-delays-us = <1000 1000 20000>;
/* Placeholder, overwritten by bootloader */
mac-address = [00 00 00 00 00 00];
status = "okay";
@@ -71,6 +72,7 @@
#size-cells = <0>;
phy-handle = <&phy1>;
phy-mode = "rgmii";
+ hisilicon,phy-reset-delays-us = <10000 10000 30000>;
/* Placeholder, overwritten by bootloader */
mac-address = [00 00 00 00 00 00];
status = "okay";
diff --git a/arch/arm/boot/dts/hisi-x5hd2.dtsi b/arch/arm/boot/dts/hisi-x5hd2.dtsi
index fdcc23d..c391ce6 100644
--- a/arch/arm/boot/dts/hisi-x5hd2.dtsi
+++ b/arch/arm/boot/dts/hisi-x5hd2.dtsi
@@ -413,6 +413,7 @@
compatible = "hisilicon,hix5hd2-clock";
reg = <0 0x2000>;
#clock-cells = <1>;
+ #reset-cells = <2>;
};
};
@@ -436,18 +437,24 @@
};
gmac0: ethernet@1840000 {
- compatible = "hisilicon,hix5hd2-gmac";
+ compatible = "hisilicon,hix5hd2-gemac", "hisilicon,hisi-gemac-v1";
reg = <0x1840000 0x1000>,<0x184300c 0x4>;
interrupts = <0 71 4>;
- clocks = <&clock HIX5HD2_MAC0_CLK>;
+ clocks = <&clock HIX5HD2_MAC0_CLK>, <&clock HIX5HD2_MAC_IFC0_CLK>;
+ clock-names = "mac_core", "mac_ifc";
+ resets = <&clock 0xcc 8>, <&clock 0xcc 10>, <&clock 0x120 4>;
+ reset-names = "mac_core", "mac_ifc", "phy";
status = "disabled";
};
gmac1: ethernet@1841000 {
- compatible = "hisilicon,hix5hd2-gmac";
+ compatible = "hisilicon,hix5hd2-gemac", "hisilicon,hisi-gemac-v1";
reg = <0x1841000 0x1000>,<0x1843010 0x4>;
interrupts = <0 72 4>;
- clocks = <&clock HIX5HD2_MAC1_CLK>;
+ clocks = <&clock HIX5HD2_MAC1_CLK>, <&clock HIX5HD2_MAC_IFC1_CLK>;
+ clock-names = "mac_core", "mac_ifc";
+ resets = <&clock 0xcc 9>, <&clock 0xcc 11>, <&clock 0x168 2>;
+ reset-names = "mac_core", "mac_ifc", "phy";
status = "disabled";
};
--
2.8.2
prev parent reply other threads:[~2016-08-11 9:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-11 9:01 [PATCH 0/4] net: hix5hd2_gmac: add tx sg feature and reset/clock control signals Dongpo Li
[not found] ` <1470906115-155569-1-git-send-email-lidongpo-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
2016-08-11 9:01 ` [PATCH 1/4] net: hix5hd2_gmac: add tx scatter-gather feature Dongpo Li
2016-08-12 18:43 ` Rob Herring
2016-08-15 6:50 ` Dongpo Li
2016-08-15 16:18 ` Rob Herring
[not found] ` <CAL_JsqLgzaPECHdX8yHC3DAUq0jXhgUFE+xVFbeV0OLQXopqxg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-08-16 2:28 ` Dongpo Li
2016-08-11 9:01 ` [PATCH 2/4] net: hix5hd2_gmac: add reset control and clock signals Dongpo Li
[not found] ` <1470906115-155569-3-git-send-email-lidongpo-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
2016-08-12 18:48 ` Rob Herring
2016-08-15 7:07 ` Dongpo Li
2016-08-11 9:01 ` [PATCH 3/4] clk: hix5hd2: change ethernet clock type Dongpo Li
[not found] ` <1470906115-155569-4-git-send-email-lidongpo-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
2016-08-11 12:09 ` kbuild test robot
[not found] ` <201608112002.qeCiGZLQ%fengguang.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2016-08-15 7:49 ` Dongpo Li
2016-08-11 9:01 ` Dongpo Li [this message]
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=1470906115-155569-5-git-send-email-lidongpo@hisilicon.com \
--to=lidongpo@hisilicon.com \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=benjamin.chenhao@hisilicon.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=howell.yang@hisilicon.com \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=mturquette@baylibre.com \
--cc=netdev@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=salil.mehta@huawei.com \
--cc=sboyd@codeaurora.org \
--cc=xuejiancheng@hisilicon.com \
--cc=yisen.zhuang@huawei.com \
--cc=zhangfei.gao@linaro.org \
/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