Merge branch '2019-12-13-master-imports'

- Assorted minor fixes

2 files changed, 4 insertions, 0 deletions

diff --git a/arch/arm/dts/am335x-brsmarc1.dts b/arch/arm/dts/am335x-brsmarc1.dts
index e1738b6dde..a63fc2da22 100644
--- a/arch/arm/dts/am335x-brsmarc1.dts
+++ b/arch/arm/dts/am335x-brsmarc1.dts
@@ -266,12 +266,14 @@
 };
 
 &cpsw_emac0 {
+	phy_id = <&davinci_mdio>, <1>;
 	phy-handle = <&ethphy0>;
 	phy-mode = "rmii";
 	ti,ledcr = <0x0480>;
 };
 
 &cpsw_emac1 {
+	phy_id = <&davinci_mdio>, <3>;
 	phy-handle = <&ethphy1>;
 	phy-mode = "rmii";
 	ti,ledcr = <0x0480>;
diff --git a/arch/arm/dts/am335x-brxre1.dts b/arch/arm/dts/am335x-brxre1.dts
index a0d046d07a..33d8ab78d8 100644
--- a/arch/arm/dts/am335x-brxre1.dts
+++ b/arch/arm/dts/am335x-brxre1.dts
@@ -221,11 +221,13 @@
 };
 
 &cpsw_emac0 {
+	phy_id = <&davinci_mdio>, <1>;
 	phy-handle = <&ethphy0>;
 	phy-mode = "mii";
 };
 
 &cpsw_emac1 {
+	phy_id = <&davinci_mdio>, <2>;
 	phy-handle = <&ethphy1>;
 	phy-mode = "mii";
 };