From 965b8e54c45b60e9d346178c8285552c3d70c28d Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Tue, 21 Apr 2015 14:12:42 +1000 Subject: 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 --- conf/machine/boards/common/zynq7-base.dtsi | 16 +++------------- conf/machine/boards/microzed/microzed-zynq7-board.dtsi | 10 ++++------ conf/machine/boards/picozed/picozed-zynq7-board.dtsi | 10 ++++------ conf/machine/boards/qemu/qemuzynq-base.dtsi | 8 +++----- conf/machine/boards/zc702/zc702-zynq7-board.dtsi | 10 ++++------ conf/machine/boards/zc706/zc706-zynq7-board.dtsi | 10 ++++------ conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi | 12 +++++------- conf/machine/boards/zybo/zybo-zynq7-board.dtsi | 10 ++++------ 8 files changed, 31 insertions(+), 55 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 @@ * ... * 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/microzed/microzed-zynq7-board.dtsi b/conf/machine/boards/microzed/microzed-zynq7-board.dtsi index 91630b14..9c57b6de 100644 --- a/conf/machine/boards/microzed/microzed-zynq7-board.dtsi +++ b/conf/machine/boards/microzed/microzed-zynq7-board.dtsi @@ -16,12 +16,10 @@ ps7_ethernet_0: ps7-ethernet@e000b000 { phy-handle = <&phy0>; phy-mode = "rgmii-id"; - mdio { - phy0: phy@0 { - compatible = "marvell,88e1512"; - device_type = "ethernet-phy"; - reg = <0>; - } ; + phy0: phy@0 { + compatible = "marvell,88e1512"; + device_type = "ethernet-phy"; + reg = <0>; } ; } ; ps7_qspi_0: ps7-qspi@e000d000 { diff --git a/conf/machine/boards/picozed/picozed-zynq7-board.dtsi b/conf/machine/boards/picozed/picozed-zynq7-board.dtsi index 2a14ea3f..ceadc0c6 100644 --- a/conf/machine/boards/picozed/picozed-zynq7-board.dtsi +++ b/conf/machine/boards/picozed/picozed-zynq7-board.dtsi @@ -12,12 +12,10 @@ ps7_ethernet_0: ps7-ethernet@e000b000 { phy-handle = <&phy0>; phy-mode = "rgmii-id"; - mdio { - phy0: phy@0 { - compatible = "marvell,88e1512"; - device_type = "ethernet-phy"; - reg = <0>; - } ; + phy0: phy@0 { + compatible = "marvell,88e1512"; + device_type = "ethernet-phy"; + reg = <0>; } ; } ; ps7_qspi_0: ps7-qspi@e000d000 { 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 557b4b82..42a2b15e 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 a7669829..7929d2c1 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 24905e87..255c5e8a 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 { diff --git a/conf/machine/boards/zybo/zybo-zynq7-board.dtsi b/conf/machine/boards/zybo/zybo-zynq7-board.dtsi index e0b5e192..c575edf8 100644 --- a/conf/machine/boards/zybo/zybo-zynq7-board.dtsi +++ b/conf/machine/boards/zybo/zybo-zynq7-board.dtsi @@ -18,12 +18,10 @@ ps7_ethernet_0: ps7-ethernet@e000b000 { phy-handle = <&phy0>; phy-mode = "rgmii-id"; - mdio { - phy0: phy@0 { - compatible = "realtek,rtl8211e"; - device_type = "ethernet-phy"; - reg = <0>; - } ; + phy0: phy@0 { + compatible = "realtek,rtl8211e"; + device_type = "ethernet-phy"; + reg = <0>; } ; } ; ps7_qspi_0: ps7-qspi@e000d000 { -- cgit v1.2.3-54-g00ecf