aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhangfei Gao <zhangfei.gao@linaro.org>2014-06-13 13:45:54 +0800
committerZhangfei Gao <zhangfei.gao@linaro.org>2014-06-13 14:12:57 +0800
commit4210291daa7475db517eab140970f30cb6e8249b (patch)
treea8ea7f85b66a6e2a378648bf7a1ab5213a270c83
parent46398e07af9f9a28474d891eb6b3792bd1e8d8c8 (diff)
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
-rw-r--r--arch/arm/boot/dts/hip04.dtsi21
1 files changed, 8 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/hip04.dtsi b/arch/arm/boot/dts/hip04.dtsi
index d960644b676d..741b5b06fac3 100644
--- a/arch/arm/boot/dts/hip04.dtsi
+++ b/arch/arm/boot/dts/hip04.dtsi
@@ -272,18 +272,16 @@
phy0: ethernet-phy@0 {
reg = <0>;
marvell,reg-init = <18 0x14 0 0x8001>;
- device_type = "ethernet-phy";
};
phy1: ethernet-phy@1 {
reg = <1>;
marvell,reg-init = <18 0x14 0 0x8001>;
- device_type = "ethernet-phy";
};
};
- ppebase: ppebase@28c0000 {
- compatible = "hisilicon,hip04-ppebase";
+ ppe: ppe@28c0000 {
+ compatible = "hisilicon,hip04-ppe", "syscon";
reg = <0x28c0000 0x10000>;
};
@@ -291,18 +289,16 @@
compatible = "hisilicon,hip04-mac";
reg = <0x28b0000 0x10000>;
interrupts = <0 413 4>;
- port = <31>;
- speed = <100>;
- id = <0>;
+ phy-mode = "mii";
+ port-handle = <&ppe 31 0>;
};
ge0: ethernet@2800000 {
compatible = "hisilicon,hip04-mac";
reg = <0x2800000 0x10000>;
interrupts = <0 402 4>;
- port = <0>;
- speed = <1000>;
- id = <1>;
+ phy-mode = "sgmii";
+ port-handle = <&ppe 0 1>;
phy-handle = <&phy0>;
};
@@ -310,9 +306,8 @@
compatible = "hisilicon,hip04-mac";
reg = <0x2880000 0x10000>;
interrupts = <0 410 4>;
- port = <8>;
- speed = <1000>;
- id = <2>;
+ phy-mode = "sgmii";
+ port-handle = <&ppe 8 2>;
phy-handle = <&phy1>;
};