diff options
| -rw-r--r-- | conf/machine/boards/common/zynq7-base.dtsi | 16 | ||||
| -rw-r--r-- | conf/machine/boards/qemu/qemuzynq-base.dtsi | 8 | ||||
| -rw-r--r-- | conf/machine/boards/zc702/zc702-zynq7-board.dtsi | 10 | ||||
| -rw-r--r-- | conf/machine/boards/zc706/zc706-zynq7-board.dtsi | 10 | ||||
| -rw-r--r-- | conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi | 12 |
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 @@ | |||
| 33 | * ... | 33 | * ... |
| 34 | * ps7_axi_interconnect_0: amba@0 { | 34 | * ps7_axi_interconnect_0: amba@0 { |
| 35 | * ps7_ethernet_0: ps7-ethernet@e000b000 { | 35 | * ps7_ethernet_0: ps7-ethernet@e000b000 { |
| 36 | * mdio { | 36 | * phy0: phy@7 { |
| 37 | * phy0: phy@7 { | 37 | * device_type = "ethernet-phy"; |
| 38 | * device_type = "ethernet-phy"; | 38 | * reg = <7>; |
| 39 | * reg = <7>; | ||
| 40 | * } ; | ||
| 41 | * } ; | 39 | * } ; |
| 42 | * } ; | 40 | * } ; |
| 43 | * } ; | 41 | * } ; |
| @@ -277,10 +275,6 @@ | |||
| 277 | xlnx,eth-mode = <0x1>; | 275 | xlnx,eth-mode = <0x1>; |
| 278 | xlnx,has-mdio = <0x1>; | 276 | xlnx,has-mdio = <0x1>; |
| 279 | xlnx,ptp-enet-clock = <111111115>; | 277 | xlnx,ptp-enet-clock = <111111115>; |
| 280 | mdio { | ||
| 281 | #address-cells = <1>; | ||
| 282 | #size-cells = <0>; | ||
| 283 | } ; | ||
| 284 | } ; | 278 | } ; |
| 285 | ps7_ethernet_1: ps7-ethernet@e000c000 { | 279 | ps7_ethernet_1: ps7-ethernet@e000c000 { |
| 286 | #address-cells = <1>; | 280 | #address-cells = <1>; |
| @@ -296,10 +290,6 @@ | |||
| 296 | xlnx,eth-mode = <0x1>; | 290 | xlnx,eth-mode = <0x1>; |
| 297 | xlnx,has-mdio = <0x1>; | 291 | xlnx,has-mdio = <0x1>; |
| 298 | xlnx,ptp-enet-clock = <111111115>; | 292 | xlnx,ptp-enet-clock = <111111115>; |
| 299 | mdio { | ||
| 300 | #address-cells = <1>; | ||
| 301 | #size-cells = <0>; | ||
| 302 | } ; | ||
| 303 | } ; | 293 | } ; |
| 304 | 294 | ||
| 305 | ps7_gpio_0: ps7-gpio@e000a000 { | 295 | 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 @@ | |||
| 19 | clocks = <&clkc 30>, <&clkc 30>, <&clk125mhz>, <&clk125mhz>, <&clkc 30>; | 19 | clocks = <&clkc 30>, <&clkc 30>, <&clk125mhz>, <&clk125mhz>, <&clkc 30>; |
| 20 | phy-handle = <&phy0>; | 20 | phy-handle = <&phy0>; |
| 21 | phy-mode = "gmii"; | 21 | phy-mode = "gmii"; |
| 22 | mdio { | 22 | phy0: phy@23 { |
| 23 | phy0: phy@23 { | 23 | device_type = "ethernet-phy"; |
| 24 | device_type = "ethernet-phy"; | 24 | reg = <23>; |
| 25 | reg = <23>; | ||
| 26 | } ; | ||
| 27 | } ; | 25 | } ; |
| 28 | } ; | 26 | } ; |
| 29 | ps7_qspi_0: ps7-qspi@e000d000 { | 27 | 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 @@ | |||
| 16 | ps7_ethernet_0: ps7-ethernet@e000b000 { | 16 | ps7_ethernet_0: ps7-ethernet@e000b000 { |
| 17 | phy-handle = <&phy0>; | 17 | phy-handle = <&phy0>; |
| 18 | phy-mode = "rgmii-id"; | 18 | phy-mode = "rgmii-id"; |
| 19 | mdio { | 19 | phy0: phy@7 { |
| 20 | phy0: phy@7 { | 20 | compatible = "marvell,88e1116r"; |
| 21 | compatible = "marvell,88e1116r"; | 21 | device_type = "ethernet-phy"; |
| 22 | device_type = "ethernet-phy"; | 22 | reg = <7>; |
| 23 | reg = <7>; | ||
| 24 | } ; | ||
| 25 | } ; | 23 | } ; |
| 26 | } ; | 24 | } ; |
| 27 | ps7_qspi_0: ps7-qspi@e000d000 { | 25 | 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 @@ | |||
| 16 | ps7_ethernet_0: ps7-ethernet@e000b000 { | 16 | ps7_ethernet_0: ps7-ethernet@e000b000 { |
| 17 | phy-handle = <&phy0>; | 17 | phy-handle = <&phy0>; |
| 18 | phy-mode = "rgmii-id"; | 18 | phy-mode = "rgmii-id"; |
| 19 | mdio { | 19 | phy0: phy@7 { |
| 20 | phy0: phy@7 { | 20 | compatible = "marvell,88e1116r"; |
| 21 | compatible = "marvell,88e1116r"; | 21 | device_type = "ethernet-phy"; |
| 22 | device_type = "ethernet-phy"; | 22 | reg = <7>; |
| 23 | reg = <7>; | ||
| 24 | } ; | ||
| 25 | } ; | 23 | } ; |
| 26 | } ; | 24 | } ; |
| 27 | ps7_qspi_0: ps7-qspi@e000d000 { | 25 | 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 @@ | |||
| 16 | ps7_ethernet_0: ps7-ethernet@e000b000 { | 16 | ps7_ethernet_0: ps7-ethernet@e000b000 { |
| 17 | phy-handle = <&phy0>; | 17 | phy-handle = <&phy0>; |
| 18 | phy-mode = "rgmii-id"; | 18 | phy-mode = "rgmii-id"; |
| 19 | mdio { | 19 | phy0: phy@0 { |
| 20 | phy0: phy@0 { | 20 | compatible = "marvell,88e1518", "marvell,88e1510"; |
| 21 | compatible = "marvell,88e1518", "marvell,88e1510"; | 21 | device_type = "ethernet-phy"; |
| 22 | device_type = "ethernet-phy"; | 22 | reg = <0>; |
| 23 | reg = <0>; | 23 | marvell,reg-init = <3 16 0xff00 0x1e 3 17 0xfff0 0x0a>; |
| 24 | marvell,reg-init = <3 16 0xff00 0x1e 3 17 0xfff0 0x0a>; | ||
| 25 | } ; | ||
| 26 | } ; | 24 | } ; |
| 27 | } ; | 25 | } ; |
| 28 | ps7_usb_0: ps7-usb@e0002000 { | 26 | ps7_usb_0: ps7-usb@e0002000 { |