diff mbox series

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

Message ID 12f50bef-ba6e-4d96-8ced-08682c931da9@gmail.com (mailing list archive)
State Accepted
Headers show
Series cleanup arc emac | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Guessed tree name to be net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 8 this patch: 8
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 7 of 7 maintainers
netdev/build_clang success Errors and warnings before: 8 this patch: 8
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 8 this patch: 8
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 22 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-06-20--03-00 (tests: 659)

Commit Message

Johan Jonker June 18, 2024, 4:13 p.m. UTC 
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>
---

[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(-)

--
2.39.2

Comments

Heiko Stübner June 19, 2024, 7:52 p.m. UTC | #1 
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
> 
>
diff mbox series

Patch

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";
 	};