From: Shawn Guo <shawnguo@kernel.org>
Date: Tue, 30 Mar 2021 08:39:44 +0000 (+0800)
Subject: Merge branch 'imx/dt64' into for-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ff5eee1bcd9e65936f56d603b4cef02a517a975d;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'imx/dt64' into for-next
---

ff5eee1bcd9e65936f56d603b4cef02a517a975d
diff --cc arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-rdk.dts
index 122c95ddad305,e5d5e6067145a..984a6b9ded8d7
--- a/arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-rdk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-rdk.dts
@@@ -33,9 -33,33 +33,33 @@@
  	};
  };
  
+ &eqos {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&pinctrl_eqos>;
+ 	phy-mode = "rgmii-id";
+ 	phy-handle = <&ethphy0>;
+ 	status = "okay";
+ 
+ 	mdio {
+ 		compatible = "snps,dwmac-mdio";
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+ 		ethphy0: ethernet-phy@1 {
+ 			compatible = "ethernet-phy-ieee802.3-c22";
+ 			reg = <0x1>;
+ 			ti,rx-internal-delay = <DP83867_RGMIIDCTL_1_50_NS>;
+ 			ti,tx-internal-delay = <DP83867_RGMIIDCTL_1_50_NS>;
+ 			ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
+ 			ti,clk-output-sel = <DP83867_CLK_O_SEL_OFF>;
+ 			enet-phy-lane-no-swap;
+ 		};
+ 	};
+ };
+ 
  &i2c2 {
  	clock-frequency = <400000>;
 -	pinctrl-names = "default";
 +	pinctrl-names = "default", "gpio";
  	pinctrl-0 = <&pinctrl_i2c2>;
  	pinctrl-1 = <&pinctrl_i2c2_gpio>;
  	sda-gpios = <&gpio5 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;