Merge tag 'omap-for-v5.1/dt-cpsw-phy' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

Device tree changes to make CPSW Ethernet use proper phy driver

We now have a proper PHY driver with drivers/phy/ti/phy-gmii-sel.c to
configure the CPSW PHY. These changes update all CPSW users to use the
new driver that already got merged during v5.0 merge window.

* tag 'omap-for-v5.1/dt-cpsw-phy' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  dt-bindings: net: ti: deprecate cpsw-phy-sel bindings
  ARM: dts: am335x: switch to use phy-gmii-sel
  ARM: dts: am4372: switch to use phy-gmii-sel
  ARM: dts: dm814x: switch to use phy-gmii-sel
  ARM: dts: dra7: switch to use phy-gmii-sel

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

16 files changed, 36 insertions, 75 deletions

diff --git a/Documentation/devicetree/bindings/net/cpsw-phy-sel.txt b/Documentation/devicetree/bindings/net/cpsw-phy-sel.txt
index 764c0c79b43d..5d76f991c027 100644
--- a/Documentation/devicetree/bindings/net/cpsw-phy-sel.txt
+++ b/Documentation/devicetree/bindings/net/cpsw-phy-sel.txt
@@ -1,4 +1,4 @@
-TI CPSW Phy mode Selection Device Tree Bindings
+TI CPSW Phy mode Selection Device Tree Bindings (DEPRECATED)
 -----------------------------------------------
 
 Required properties:
diff --git a/arch/arm/boot/dts/am335x-baltos-ir2110.dts b/arch/arm/boot/dts/am335x-baltos-ir2110.dts
index 75de1e723303..50dcf1290ac6 100644
--- a/arch/arm/boot/dts/am335x-baltos-ir2110.dts
+++ b/arch/arm/boot/dts/am335x-baltos-ir2110.dts
@@ -72,7 +72,3 @@
         dual_emac_res_vlan = <2>;
         phy-handle = <&phy1>;
 };
-
-&phy_sel {
-        rmii-clock-ext = <1>;
-};
diff --git a/arch/arm/boot/dts/am335x-baltos-ir3220.dts b/arch/arm/boot/dts/am335x-baltos-ir3220.dts
index 1b215c425c57..f3f1abd26470 100644
--- a/arch/arm/boot/dts/am335x-baltos-ir3220.dts
+++ b/arch/arm/boot/dts/am335x-baltos-ir3220.dts
@@ -114,7 +114,3 @@
         dual_emac_res_vlan = <2>;
         phy-handle = <&phy1>;
 };
-
-&phy_sel {
-        rmii-clock-ext = <1>;
-};
diff --git a/arch/arm/boot/dts/am335x-baltos-ir5221.dts b/arch/arm/boot/dts/am335x-baltos-ir5221.dts
index 832ead864dc5..42f473f0ed77 100644
--- a/arch/arm/boot/dts/am335x-baltos-ir5221.dts
+++ b/arch/arm/boot/dts/am335x-baltos-ir5221.dts
@@ -133,10 +133,6 @@
         phy-handle = <&phy1>;
 };
 
-&phy_sel {
-        rmii-clock-ext = <1>;
-};
-
 &dcan1 {
         pinctrl-names = "default";
         pinctrl-0 = <&dcan1_pins>;
diff --git a/arch/arm/boot/dts/am335x-chiliboard.dts b/arch/arm/boot/dts/am335x-chiliboard.dts
index b50d5d2e71ff..bffa5dce54ec 100644
--- a/arch/arm/boot/dts/am335x-chiliboard.dts
+++ b/arch/arm/boot/dts/am335x-chiliboard.dts
@@ -155,10 +155,6 @@
         phy-mode = "rmii";
 };
 
-&phy_sel {
-        rmii-clock-ext;
-};
-
 /* USB */
 &usb {
         status = "okay";
diff --git a/arch/arm/boot/dts/am335x-icev2.dts b/arch/arm/boot/dts/am335x-icev2.dts
index f2005ecca74f..9ac775c71072 100644
--- a/arch/arm/boot/dts/am335x-icev2.dts
+++ b/arch/arm/boot/dts/am335x-icev2.dts
@@ -484,10 +484,6 @@
         dual_emac;
 };
 
-&phy_sel {
-        rmii-clock-ext;
-};
-
 &davinci_mdio {
         pinctrl-names = "default", "sleep";
         pinctrl-0 = <&davinci_mdio_default>;
diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi
index 55b4c94cfafb..cbd22f25de95 100644
--- a/arch/arm/boot/dts/am335x-igep0033.dtsi
+++ b/arch/arm/boot/dts/am335x-igep0033.dtsi
@@ -123,10 +123,6 @@
         phy-mode = "rmii";
 };
 
-&phy_sel {
-        rmii-clock-ext;
-};
-
 &elm {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/am335x-lxm.dts b/arch/arm/boot/dts/am335x-lxm.dts
index 481edcfaf121..d0e8e720a4d6 100644
--- a/arch/arm/boot/dts/am335x-lxm.dts
+++ b/arch/arm/boot/dts/am335x-lxm.dts
@@ -328,10 +328,6 @@
         dual_emac_res_vlan = <3>;
 };
 
-&phy_sel {
-        rmii-clock-ext;
-};
-
 &mac {
         pinctrl-names = "default", "sleep";
         pinctrl-0 = <&cpsw_default>;
diff --git a/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi b/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
index 14f781953475..cb5913a69837 100644
--- a/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
+++ b/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
@@ -159,11 +159,6 @@
         status = "okay";
 };
 
-&phy_sel {
-        reg= <0x44e10650 0xf5>;
-        rmii-clock-ext;
-};
-
 &sham {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts b/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
index 5a58efc0c874..e562ce40f290 100644
--- a/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
+++ b/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
@@ -446,11 +446,6 @@
         dual_emac_res_vlan = <2>;
 };
 
-&phy_sel {
-        reg= <0x44e10650 0xf5>;
-        rmii-clock-ext;
-};
-
 &sham {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
index 428a25e952b0..015adb626b03 100644
--- a/arch/arm/boot/dts/am335x-phycore-som.dtsi
+++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
@@ -100,10 +100,6 @@
         status = "okay";
 };
 
-&phy_sel {
-        rmii-clock-ext;
-};
-
 /* I2C Busses */
 &am33xx_pinmux {
         i2c0_pins: pinmux_i2c0 {
diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
index e957370f8aec..f459ec316a22 100644
--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -279,12 +279,6 @@
                                 #pinctrl-cells = <1>;
                                 ranges = <0 0 0x2000>;
 
-                                phy_sel: cpsw-phy-sel@650 {
-                                        compatible = "ti,am3352-cpsw-phy-sel";
-                                        reg= <0x650 0x4>;
-                                        reg-names = "gmii-sel";
-                                };
-
                                 am33xx_pinmux: pinmux@800 {
                                         compatible = "pinctrl-single";
                                         reg = <0x800 0x238>;
@@ -300,6 +294,12 @@
                                         #size-cells = <1>;
                                         ranges = <0 0 0x800>;
 
+                                        phy_gmii_sel: phy-gmii-sel {
+                                                compatible = "ti,am3352-phy-gmii-sel";
+                                                reg = <0x650 0x4>;
+                                                #phy-cells = <2>;
+                                        };
+
                                         scm_clocks: clocks {
                                                 #address-cells = <1>;
                                                 #size-cells = <0>;
@@ -715,7 +715,6 @@
                                 interrupts = <40 41 42 43>;
                                 ranges = <0 0 0x8000>;
                                 syscon = <&scm_conf>;
-                                cpsw-phy-sel = <&phy_sel>;
                                 status = "disabled";
 
                                 davinci_mdio: mdio@1000 {
@@ -731,11 +730,13 @@
                                 cpsw_emac0: slave@200 {
                                         /* Filled in by U-Boot */
                                         mac-address = [ 00 00 00 00 00 00 ];
+                                        phys = <&phy_gmii_sel 1 1>;
                                 };
 
                                 cpsw_emac1: slave@300 {
                                         /* Filled in by U-Boot */
                                         mac-address = [ 00 00 00 00 00 00 ];
+                                        phys = <&phy_gmii_sel 2 1>;
                                 };
                         };
                 };
diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
index ca0896f80248..85c6f4ff1824 100644
--- a/arch/arm/boot/dts/am437x-l4.dtsi
+++ b/arch/arm/boot/dts/am437x-l4.dtsi
@@ -280,12 +280,6 @@
                                 #size-cells = <1>;
                                 ranges = <0 0 0x4000>;
 
-                                phy_sel: cpsw-phy-sel@650 {
-                                        compatible = "ti,am43xx-cpsw-phy-sel";
-                                        reg= <0x650 0x4>;
-                                        reg-names = "gmii-sel";
-                                };
-
                                 am43xx_pinmux: pinmux@800 {
                                         compatible = "ti,am437-padconf",
                                                      "pinctrl-single";
@@ -300,11 +294,17 @@
                                 };
 
                                 scm_conf: scm_conf@0 {
-                                        compatible = "syscon";
+                                        compatible = "syscon", "simple-bus";
                                         reg = <0x0 0x800>;
                                         #address-cells = <1>;
                                         #size-cells = <1>;
 
+                                        phy_gmii_sel: phy-gmii-sel {
+                                                compatible = "ti,am43xx-phy-gmii-sel";
+                                                reg = <0x650 0x4>;
+                                                #phy-cells = <2>;
+                                        };
+
                                         scm_clocks: clocks {
                                                 #address-cells = <1>;
                                                 #size-cells = <0>;
@@ -555,7 +555,6 @@
                                 cpts_clock_shift = <29>;
                                 ranges = <0 0 0x8000>;
                                 syscon = <&scm_conf>;
-                                cpsw-phy-sel = <&phy_sel>;
 
                                 davinci_mdio: mdio@1000 {
                                         compatible = "ti,am4372-mdio","ti,cpsw-mdio","ti,davinci_mdio";
@@ -572,11 +571,13 @@
                                 cpsw_emac0: slave@200 {
                                         /* Filled in by U-Boot */
                                         mac-address = [ 00 00 00 00 00 00 ];
+                                        phys = <&phy_gmii_sel 1 0>;
                                 };
 
                                 cpsw_emac1: slave@300 {
                                         /* Filled in by U-Boot */
                                         mac-address = [ 00 00 00 00 00 00 ];
+                                        phys = <&phy_gmii_sel 2 0>;
                                 };
                         };
                 };
diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index 4ea753b3ee43..9dfd80e3b76e 100644
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -584,10 +584,7 @@
 &cpsw_emac0 {
         phy-handle = <&ethphy0>;
         phy-mode = "rmii";
-};
-
-&phy_sel {
-        rmii-clock-ext;
+        phys = <&phy_gmii_sel 1 1>;
 };
 
 &i2c0 {
diff --git a/arch/arm/boot/dts/dm814x.dtsi b/arch/arm/boot/dts/dm814x.dtsi
index f044abd64b7e..95de9f214c14 100644
--- a/arch/arm/boot/dts/dm814x.dtsi
+++ b/arch/arm/boot/dts/dm814x.dtsi
@@ -405,6 +405,12 @@
                                         #size-cells = <1>;
                                         ranges = <0 0 0x800>;
 
+                                        phy_gmii_sel: phy-gmii-sel {
+                                                compatible = "ti,dm814-phy-gmii-sel";
+                                                reg = <0x650 0x4>;
+                                                #phy-cells = <1>;
+                                        };
+
                                         scm_clocks: clocks {
                                                 #address-cells = <1>;
                                                 #size-cells = <0>;
@@ -611,17 +617,14 @@
                         cpsw_emac0: slave@4a100200 {
                                 /* Filled in by U-Boot */
                                 mac-address = [ 00 00 00 00 00 00 ];
+                                phys = <&phy_gmii_sel 1>;
+
                         };
 
                         cpsw_emac1: slave@4a100300 {
                                 /* Filled in by U-Boot */
                                 mac-address = [ 00 00 00 00 00 00 ];
-                        };
-
-                        phy_sel: cpsw-phy-sel@48140650 {
-                                compatible = "ti,am3352-cpsw-phy-sel";
-                                reg= <0x48140650 0x4>;
-                                reg-names = "gmii-sel";
+                                phys = <&phy_gmii_sel 2>;
                         };
                 };
 
diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi
index bb45cb7fc3b6..414f1cd68733 100644
--- a/arch/arm/boot/dts/dra7-l4.dtsi
+++ b/arch/arm/boot/dts/dra7-l4.dtsi
@@ -77,18 +77,18 @@
                                                 };
                                         };
 
+                                        phy_gmii_sel: phy-gmii-sel {
+                                                compatible = "ti,dra7xx-phy-gmii-sel";
+                                                reg = <0x554 0x4>;
+                                                #phy-cells = <1>;
+                                        };
+
                                         scm_conf_clocks: clocks {
                                                 #address-cells = <1>;
                                                 #size-cells = <0>;
                                         };
                                 };
 
-                                phy_sel: cpsw-phy-sel@554 {
-                                        compatible = "ti,dra7xx-cpsw-phy-sel";
-                                        reg= <0x554 0x4>;
-                                        reg-names = "gmii-sel";
-                                };
-
                                 dra7_pmx_core: pinmux@1400 {
                                         compatible = "ti,dra7-padconf",
                                                      "pinctrl-single";
@@ -3099,7 +3099,6 @@
                                              <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>;
                                 ranges = <0 0 0x4000>;
                                 syscon = <&scm_conf>;
-                                cpsw-phy-sel = <&phy_sel>;
                                 status = "disabled";
 
                                 davinci_mdio: mdio@1000 {
@@ -3114,11 +3113,13 @@
                                 cpsw_emac0: slave@200 {
                                         /* Filled in by U-Boot */
                                         mac-address = [ 00 00 00 00 00 00 ];
+                                        phys = <&phy_gmii_sel 1>;
                                 };
 
                                 cpsw_emac1: slave@300 {
                                         /* Filled in by U-Boot */
                                         mac-address = [ 00 00 00 00 00 00 ];
+                                        phys = <&phy_gmii_sel 2>;
                                 };
                         };
                 };