ARM: dts: rockchip: rk3xxx: fix emac node

In the combined DT of rk3066a/rk3188 the emac node uses as place holder
the compatible string "snps,arc-emac". The last real user nSIM_700
of the "snps,arc-emac" compatible string in a driver was removed in 2019.
Rockchip emac nodes don't make use of this common fall back string.
In order to removed unused driver code replace this string with
"rockchip,rk3066-emac".
As we are there remove the blank lines and sort.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/arm/boot/dts/rockchip/rk3066a.dtsi b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
index 30139f21de64d0e3a11fc510e54e49e508c69fa9..51ae0418a7dbff94306ab98e4d13ea09c4d68ccd 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
@@ -879,7 +879,3 @@
 &wdt {
        compatible = "rockchip,rk3066-wdt", "snps,dw-wdt";
 };
-
-&emac {
-       compatible = "rockchip,rk3066-emac";
-};

diff --git a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
index f37137f298d5f1605d0fb491624c363ea42adb8f..e6a78bcf916382841b59900be3a6c84603950926 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
@@ -194,17 +194,14 @@
        };
 
        emac: ethernet@10204000 {
-               compatible = "snps,arc-emac";
+               compatible = "rockchip,rk3066-emac";
                reg = <0x10204000 0x3c>;
                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-
-               rockchip,grf = <&grf>;
-
                clocks = <&cru HCLK_EMAC>, <&cru SCLK_MAC>;
                clock-names = "hclk", "macref";
                max-speed = <100>;
                phy-mode = "rmii";
-
+               rockchip,grf = <&grf>;
                status = "disabled";
        };