Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1662385 > unrolled thread

[PATCH] arm64: allwinner: sun50i-a64: Remove duplicate ethernet@1c30000

Started byJagan Teki <jagannadh.teki@gmail.com>
First post2017-06-09 14:50 +0200
Last post2017-06-09 16:00 +0200
Articles 3 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] arm64: allwinner: sun50i-a64: Remove duplicate ethernet@1c30000 Jagan Teki <jagannadh.teki@gmail.com> - 2017-06-09 14:50 +0200
    Re: [linux-sunxi] [PATCH] arm64: allwinner: sun50i-a64: Remove  duplicate ethernet@1c30000 Andre Przywara <andre.przywara@arm.com> - 2017-06-09 15:40 +0200
      Re: [linux-sunxi] [PATCH] arm64: allwinner: sun50i-a64: Remove  duplicate ethernet@1c30000 Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-06-09 16:00 +0200

#1662385 — [PATCH] arm64: allwinner: sun50i-a64: Remove duplicate ethernet@1c30000

FromJagan Teki <jagannadh.teki@gmail.com>
Date2017-06-09 14:50 +0200
Subject[PATCH] arm64: allwinner: sun50i-a64: Remove duplicate ethernet@1c30000
Message-ID<tQrwu-1Aq-15@gated-at.bofh.it>
From: Jagan Teki <jagan@amarulasolutions.com>

Remove duplicate ethernet@1c30000 from allwinner/sun50i-a64.dtsi

Build error:
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dtb:
ERROR (duplicate_node_names): Duplicate node name /soc/ethernet@1c30000
ERROR: Input tree has errors, aborting (use -f to force output)

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index 1b36aab..9d00622 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -469,26 +469,6 @@
 			};
 		};
 
-		emac: ethernet@1c30000 {
-			compatible = "allwinner,sun50i-a64-emac";
-			syscon = <&syscon>;
-			reg = <0x01c30000 0x100>;
-			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "macirq";
-			resets = <&ccu RST_BUS_EMAC>;
-			reset-names = "stmmaceth";
-			clocks = <&ccu CLK_BUS_EMAC>;
-			clock-names = "stmmaceth";
-			status = "disabled";
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			mdio: mdio {
-				#address-cells = <1>;
-				#size-cells = <0>;
-			};
-		};
-
 		gic: interrupt-controller@1c81000 {
 			compatible = "arm,gic-400";
 			reg = <0x01c81000 0x1000>,
-- 
1.9.1

[toc] | [next] | [standalone]


#1662429 — Re: [linux-sunxi] [PATCH] arm64: allwinner: sun50i-a64: Remove duplicate ethernet@1c30000

FromAndre Przywara <andre.przywara@arm.com>
Date2017-06-09 15:40 +0200
SubjectRe: [linux-sunxi] [PATCH] arm64: allwinner: sun50i-a64: Remove duplicate ethernet@1c30000
Message-ID<tQsiS-25k-17@gated-at.bofh.it>
In reply to#1662385
Hi,

On 09/06/17 13:40, Jagan Teki wrote:
> From: Jagan Teki <jagan@amarulasolutions.com>
> 
> Remove duplicate ethernet@1c30000 from allwinner/sun50i-a64.dtsi

I think this is an artefact of the sun8i-dwmac merging, where both David
and Maxime merged the DT patches in their trees (compare e53f67e9 and
103aefa0). I think both of them are in the process of sorting this out
(as this effects more than this hunk, I believe).

Cheers,
Andre.

> 
> Build error:
> arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dtb:
> ERROR (duplicate_node_names): Duplicate node name /soc/ethernet@1c30000
> ERROR: Input tree has errors, aborting (use -f to force output)
> 
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
>  arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 20 --------------------
>  1 file changed, 20 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
> index 1b36aab..9d00622 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
> @@ -469,26 +469,6 @@
>  			};
>  		};
>  
> -		emac: ethernet@1c30000 {
> -			compatible = "allwinner,sun50i-a64-emac";
> -			syscon = <&syscon>;
> -			reg = <0x01c30000 0x100>;
> -			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
> -			interrupt-names = "macirq";
> -			resets = <&ccu RST_BUS_EMAC>;
> -			reset-names = "stmmaceth";
> -			clocks = <&ccu CLK_BUS_EMAC>;
> -			clock-names = "stmmaceth";
> -			status = "disabled";
> -			#address-cells = <1>;
> -			#size-cells = <0>;
> -
> -			mdio: mdio {
> -				#address-cells = <1>;
> -				#size-cells = <0>;
> -			};
> -		};
> -
>  		gic: interrupt-controller@1c81000 {
>  			compatible = "arm,gic-400";
>  			reg = <0x01c81000 0x1000>,
> 

[toc] | [prev] | [next] | [standalone]


#1662466 — Re: [linux-sunxi] [PATCH] arm64: allwinner: sun50i-a64: Remove duplicate ethernet@1c30000

FromMaxime Ripard <maxime.ripard@free-electrons.com>
Date2017-06-09 16:00 +0200
SubjectRe: [linux-sunxi] [PATCH] arm64: allwinner: sun50i-a64: Remove duplicate ethernet@1c30000
Message-ID<tQsCg-2cm-57@gated-at.bofh.it>
In reply to#1662429

[Multipart message — attachments visible in raw view] — view raw

On Fri, Jun 09, 2017 at 02:38:39PM +0100, Andre Przywara wrote:
> Hi,
> 
> On 09/06/17 13:40, Jagan Teki wrote:
> > From: Jagan Teki <jagan@amarulasolutions.com>
> > 
> > Remove duplicate ethernet@1c30000 from allwinner/sun50i-a64.dtsi
> 
> I think this is an artefact of the sun8i-dwmac merging, where both David
> and Maxime merged the DT patches in their trees (compare e53f67e9 and
> 103aefa0). I think both of them are in the process of sorting this out
> (as this effects more than this hunk, I believe).

Yeah, hopefully we'll manage to fix this.

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web