summaryrefslogtreecommitdiffstats
path: root/conf/machine/boards/common
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2015-04-21 14:12:42 +1000
committerNathan Rossi <nathan.rossi@xilinx.com>2015-04-21 14:12:42 +1000
commit965b8e54c45b60e9d346178c8285552c3d70c28d (patch)
tree3605164372cc325ed97d83c8c824af7b093b7996 /conf/machine/boards/common
parent771ca5f0e643a72eddcccde9cd19fbf49ff81650 (diff)
downloadmeta-xilinx-965b8e54c45b60e9d346178c8285552c3d70c28d.tar.gz
zynq7-base.dtsi: Update bindings for PHYs attached to ethernet nodes
* Update the bindings to match upstream definitions for the PHY * The macb driver does not follow the phy-handle property and relies on the PHY being located as the first child node of the ethernet device * Remove the MDIO node and update all boards to nest the PHY as the first child node of the ethernet device, this change is backward compatible with the bindings for the linux-xlnx xemacps driver which follows the phy-handle definition Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Diffstat (limited to 'conf/machine/boards/common')
-rw-r--r--conf/machine/boards/common/zynq7-base.dtsi16
1 files changed, 3 insertions, 13 deletions
diff --git a/conf/machine/boards/common/zynq7-base.dtsi b/conf/machine/boards/common/zynq7-base.dtsi
index a58cf479..5edbdb1f 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 {