aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/boards/common/zynq7-base.dtsi16
-rw-r--r--conf/machine/boards/qemu/qemuzynq-base.dtsi8
-rw-r--r--conf/machine/boards/zc702/zc702-zynq7-board.dtsi10
-rw-r--r--conf/machine/boards/zc706/zc706-zynq7-board.dtsi10
-rw-r--r--conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi12
5 files changed, 19 insertions, 37 deletions
diff --git a/conf/machine/boards/common/zynq7-base.dtsi b/conf/machine/boards/common/zynq7-base.dtsi
index eb1e320e..bdf8c1c8 100644
--- a/conf/machine/boards/common/zynq7-base.dtsi
+++ b/conf/machine/boards/common/zynq7-base.dtsi
@@ -33,11 +33,9 @@
* ...
* ps7_axi_interconnect_0: amba@0 {
* ps7_ethernet_0: ps7-ethernet@e000b000 {
- * mdio {
- * phy0: phy@7 {
- * device_type = "ethernet-phy";
- * reg = <7>;
- * } ;
+ * phy0: phy@7 {
+ * device_type = "ethernet-phy";
+ * reg = <7>;
* } ;
* } ;
* } ;
@@ -277,10 +275,6 @@
xlnx,eth-mode = <0x1>;
xlnx,has-mdio = <0x1>;
xlnx,ptp-enet-clock = <111111115>;
- mdio {
- #address-cells = <1>;
- #size-cells = <0>;
- } ;
} ;
ps7_ethernet_1: ps7-ethernet@e000c000 {
#address-cells = <1>;
@@ -296,10 +290,6 @@
xlnx,eth-mode = <0x1>;
xlnx,has-mdio = <0x1>;
xlnx,ptp-enet-clock = <111111115>;
- mdio {
- #address-cells = <1>;
- #size-cells = <0>;
- } ;
} ;
ps7_gpio_0: ps7-gpio@e000a000 {
diff --git a/conf/machine/boards/qemu/qemuzynq-base.dtsi b/conf/machine/boards/qemu/qemuzynq-base.dtsi
index a2f06657..9d6b8c75 100644
--- a/conf/machine/boards/qemu/qemuzynq-base.dtsi
+++ b/conf/machine/boards/qemu/qemuzynq-base.dtsi
@@ -19,11 +19,9 @@
clocks = <&clkc 30>, <&clkc 30>, <&clk125mhz>, <&clk125mhz>, <&clkc 30>;
phy-handle = <&phy0>;
phy-mode = "gmii";
- mdio {
- phy0: phy@23 {
- device_type = "ethernet-phy";
- reg = <23>;
- } ;
+ phy0: phy@23 {
+ device_type = "ethernet-phy";
+ reg = <23>;
} ;
} ;
ps7_qspi_0: ps7-qspi@e000d000 {
diff --git a/conf/machine/boards/zc702/zc702-zynq7-board.dtsi b/conf/machine/boards/zc702/zc702-zynq7-board.dtsi
index ee70718e..a0b14c6c 100644
--- a/conf/machine/boards/zc702/zc702-zynq7-board.dtsi
+++ b/conf/machine/boards/zc702/zc702-zynq7-board.dtsi
@@ -16,12 +16,10 @@
ps7_ethernet_0: ps7-ethernet@e000b000 {
phy-handle = <&phy0>;
phy-mode = "rgmii-id";
- mdio {
- phy0: phy@7 {
- compatible = "marvell,88e1116r";
- device_type = "ethernet-phy";
- reg = <7>;
- } ;
+ phy0: phy@7 {
+ compatible = "marvell,88e1116r";
+ device_type = "ethernet-phy";
+ reg = <7>;
} ;
} ;
ps7_qspi_0: ps7-qspi@e000d000 {
diff --git a/conf/machine/boards/zc706/zc706-zynq7-board.dtsi b/conf/machine/boards/zc706/zc706-zynq7-board.dtsi
index 39418eaf..101d5992 100644
--- a/conf/machine/boards/zc706/zc706-zynq7-board.dtsi
+++ b/conf/machine/boards/zc706/zc706-zynq7-board.dtsi
@@ -16,12 +16,10 @@
ps7_ethernet_0: ps7-ethernet@e000b000 {
phy-handle = <&phy0>;
phy-mode = "rgmii-id";
- mdio {
- phy0: phy@7 {
- compatible = "marvell,88e1116r";
- device_type = "ethernet-phy";
- reg = <7>;
- } ;
+ phy0: phy@7 {
+ compatible = "marvell,88e1116r";
+ device_type = "ethernet-phy";
+ reg = <7>;
} ;
} ;
ps7_qspi_0: ps7-qspi@e000d000 {
diff --git a/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi b/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi
index 75fb1f12..18374767 100644
--- a/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi
+++ b/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi
@@ -16,13 +16,11 @@
ps7_ethernet_0: ps7-ethernet@e000b000 {
phy-handle = <&phy0>;
phy-mode = "rgmii-id";
- mdio {
- phy0: phy@0 {
- compatible = "marvell,88e1518", "marvell,88e1510";
- device_type = "ethernet-phy";
- reg = <0>;
- marvell,reg-init = <3 16 0xff00 0x1e 3 17 0xfff0 0x0a>;
- } ;
+ phy0: phy@0 {
+ compatible = "marvell,88e1518", "marvell,88e1510";
+ device_type = "ethernet-phy";
+ reg = <0>;
+ marvell,reg-init = <3 16 0xff00 0x1e 3 17 0xfff0 0x0a>;
} ;
} ;
ps7_usb_0: ps7-usb@e0002000 {