diff options
| author | Johan Jonker <jbx6244@gmail.com> | 2024-06-18 18:13:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-06-21 10:07:17 +0100 |
| commit | a8bd4d7af70d3e042bcffbdc5aa785b30b1a393e (patch) | |
| tree | 24538e7f6ce8e8ff78f3cb937bf5061b621196f4 /arch/arm/boot | |
| parent | 86474deeb5c3e57258839a4389ec75c7a871d4af (diff) | |
| download | linux-a8bd4d7af70d3e042bcffbdc5aa785b30b1a393e.tar.gz linux-a8bd4d7af70d3e042bcffbdc5aa785b30b1a393e.tar.bz2 linux-a8bd4d7af70d3e042bcffbdc5aa785b30b1a393e.zip | |
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>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/rockchip/rk3066a.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rockchip/rk3xxx.dtsi | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/rockchip/rk3066a.dtsi b/arch/arm/boot/dts/rockchip/rk3066a.dtsi index 30139f21de64..51ae0418a7db 100644 --- 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 f37137f298d5..e6a78bcf9163 100644 --- 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"; }; |