ARM: dts: dra7: drop legacy cpsw dt node

All dra7/am57 boards converted to use new driver, so drop legacy
cpsw dt node.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi
index 27a6a83cc60c044d9a2f7eea16600ea310ac77e5..703ba6a26272a52a5135ada85508ddb9516a4702 100644 (file)
--- a/arch/arm/boot/dts/dra7-l4.dtsi
+++ b/arch/arm/boot/dts/dra7-l4.dtsi
@@ -3038,60 +3038,6 @@
                         */
                        ti,no-idle;
 
-                       mac: ethernet@0 {
-                               compatible = "ti,dra7-cpsw","ti,cpsw";
-                               clocks = <&gmac_main_clk>, <&gmac_clkctrl DRA7_GMAC_GMAC_CLKCTRL 25>;
-                               clock-names = "fck", "cpts";
-                               cpdma_channels = <8>;
-                               ale_entries = <1024>;
-                               bd_ram_size = <0x2000>;
-                               mac_control = <0x20>;
-                               slaves = <2>;
-                               active_slave = <0>;
-                               cpts_clock_mult = <0x784CFE14>;
-                               cpts_clock_shift = <29>;
-                               reg = <0x0 0x1000
-                                      0x1200 0x2e00>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               /*
-                                * rx_thresh_pend
-                                * rx_pend
-                                * tx_pend
-                                * misc_pend
-                                */
-                               interrupts = <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
-                                            <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
-                                            <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
-                                            <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>;
-                               ranges = <0 0 0x4000>;
-                               syscon = <&scm_conf>;
-                               status = "disabled";
-
-                               davinci_mdio: mdio@1000 {
-                                       compatible = "ti,cpsw-mdio","ti,davinci_mdio";
-                                       clocks = <&gmac_main_clk>;
-                                       clock-names = "fck";
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       bus_freq = <1000000>;
-                                       reg = <0x1000 0x100>;
-                               };
-
-                               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>;
-                               };
-                       };
-
                        mac_sw: switch@0 {
                                compatible = "ti,dra7-cpsw-switch","ti,cpsw-switch";
                                reg = <0x0 0x4000>;

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index cca6b123856fe64f5c61bb96bf1e9083c20a049f..4e1bbc0198eb7f6e1a0db7de486b3c753b09ebfd 100644 (file)
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -37,8 +37,8 @@
                serial7 = &uart8;
                serial8 = &uart9;
                serial9 = &uart10;
-               ethernet0 = &cpsw_emac0;
-               ethernet1 = &cpsw_emac1;
+               ethernet0 = &cpsw_port1;
+               ethernet1 = &cpsw_port2;
                d_can0 = &dcan1;
                d_can1 = &dcan2;
                spi0 = &qspi;