Skip to content

Commit

Permalink
ARM: dts: rockchip: rk3xxx: fix emac node
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johan Jonker authored and David S. Miller committed Jun 21, 2024
1 parent 86474de commit a8bd4d7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
4 changes: 0 additions & 4 deletions arch/arm/boot/dts/rockchip/rk3066a.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,3 @@
&wdt {
compatible = "rockchip,rk3066-wdt", "snps,dw-wdt";
};

&emac {
compatible = "rockchip,rk3066-emac";
};
7 changes: 2 additions & 5 deletions arch/arm/boot/dts/rockchip/rk3xxx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};

Expand Down

0 comments on commit a8bd4d7

Please sign in to comment.