Re: [PATCH v1 1/3] ARM: dts: rockchip: rk3xxx: fix emac node

Heiko Stübner
2024-06-19T19:53:00Z

Am Dienstag, 18. Juni 2024, 18:13:56 CEST schrieb Johan Jonker:
> 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>

I think this is fine going through the network tree together with the
other two patches.

> ---
>
> [PATCH 8/8] ARC: nSIM_700: remove unused network options
> https://lore.kernel.org/all/20191023124417.5770-9-Eugeniy.Paltsev@synopsys.com/
> ---
> arch/arm/boot/dts/rockchip/rk3066a.dtsi | 4 ----
> 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 5e0750547ab5..3f6d49459734 100644
> --- a/arch/arm/boot/dts/rockchip/rk3066a.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
> @@ -896,7 +896,3 @@ &vpu {
> &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 @@ usb_host: usb@101c0000 {
> };
>
> 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";
> };
>
> --
> 2.39.2
>
>