Refactor the common settings for device tree node 'fec' into the generic phycore i.MX6 device tree file. This avoid redundant settings and makes common fixes easier. Our kernel device tree files have the same layout. Signed-off-by: Stefan Lengfeld <s.lengfeld@xxxxxxxxx> --- arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts | 17 ++++------------- arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts | 17 ++++------------- arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts | 17 ++++------------- arch/arm/dts/imx6q-phytec-phycore-som-nand.dts | 17 ++++------------- arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi | 13 +++++++++++++ 5 files changed, 29 insertions(+), 52 deletions(-) diff --git a/arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts b/arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts index fc153a6..bffee5f 100644 --- a/arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts +++ b/arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts @@ -29,21 +29,12 @@ status = "okay"; }; +ðphy { + max-speed = <100>; +}; + &fec { status = "okay"; - phy-handle = <ðphy>; - phy-mode = "rgmii"; - phy-reset-gpios = <&gpio1 14 1>; - - mdio { - #address-cells = <1>; - #size-cells = <0>; - - ethphy: ethernet-phy@3 { - reg = <3>; - max-speed = <100>; - }; - }; }; &flash { diff --git a/arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts b/arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts index 3f2f1c7..1b66fda 100644 --- a/arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts +++ b/arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts @@ -24,21 +24,12 @@ status = "okay"; }; +ðphy { + max-speed = <100>; +}; + &fec { status = "okay"; - phy-handle = <ðphy>; - phy-mode = "rgmii"; - phy-reset-gpios = <&gpio1 14 1>; - - mdio { - #address-cells = <1>; - #size-cells = <0>; - - ethphy: ethernet-phy@3 { - reg = <3>; - max-speed = <100>; - }; - }; }; &gpmi { diff --git a/arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts b/arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts index 74bc09b..ecc5aa3 100644 --- a/arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts +++ b/arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts @@ -28,21 +28,12 @@ status = "okay"; }; +ðphy { + max-speed = <1000>; +}; + &fec { status = "okay"; - phy-handle = <ðphy>; - phy-mode = "rgmii"; - phy-reset-gpios = <&gpio1 14 1>; - - mdio { - #address-cells = <1>; - #size-cells = <0>; - - ethphy: ethernet-phy@3 { - reg = <3>; - max-speed = <1000>; - }; - }; }; &flash { diff --git a/arch/arm/dts/imx6q-phytec-phycore-som-nand.dts b/arch/arm/dts/imx6q-phytec-phycore-som-nand.dts index aa2c94a..9ad7eda 100644 --- a/arch/arm/dts/imx6q-phytec-phycore-som-nand.dts +++ b/arch/arm/dts/imx6q-phytec-phycore-som-nand.dts @@ -29,21 +29,12 @@ status = "okay"; }; +ðphy { + max-speed = <1000>; +}; + &fec { status = "okay"; - phy-handle = <ðphy>; - phy-mode = "rgmii"; - phy-reset-gpios = <&gpio1 14 1>; - - mdio { - #address-cells = <1>; - #size-cells = <0>; - - ethphy: ethernet-phy@3 { - reg = <3>; - max-speed = <1000>; - }; - }; }; &flash { diff --git a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi index d446a5e..9649817 100644 --- a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi @@ -10,6 +10,7 @@ */ #include "imx6qdl.dtsi" +#include <dt-bindings/gpio/gpio.h> / { chosen { @@ -76,7 +77,19 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; + phy-handle = <ðphy>; + phy-mode = "rgmii"; + phy-reset-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; status = "disabled"; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethphy: ethernet-phy@3 { + reg = <3>; + }; + }; }; &gpmi { -- 1.9.1 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox