linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] ARM: zynq: DT: Use the zynq binding with macb
@ 2015-05-27 19:58 Nathan Sullivan
  2015-05-28  8:22 ` Russell King - ARM Linux
  0 siblings, 1 reply; 2+ messages in thread
From: Nathan Sullivan @ 2015-05-27 19:58 UTC (permalink / raw)
  To: michal.simek
  Cc: soren.brinkmann, linux, devicetree, linux-kernel, Nathan Sullivan

Use the new zynq binding for macb ethernet, since it will disable half
duplex gigabit like the Zynq TRM says to do. Also allow the compatible
cadence gem binding that won't disable half duplex but works otherwise.

Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
---
 arch/arm/boot/dts/zynq-7000.dtsi |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index a5cd2ed..154bf93 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -57,7 +57,7 @@
 		regulator-always-on;
 	};
 
-	amba {
+	amba@0 {
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -193,7 +193,7 @@
 		};
 
 		gem0: ethernet@e000b000 {
-			compatible = "cdns,gem";
+			compatible = "cdns,zynq-gem", "cdns,gem";
 			reg = <0xe000b000 0x1000>;
 			status = "disabled";
 			interrupts = <0 22 4>;
@@ -204,7 +204,7 @@
 		};
 
 		gem1: ethernet@e000c000 {
-			compatible = "cdns,gem";
+			compatible = "cdns,zynq-gem", "cdns,gem";
 			reg = <0xe000c000 0x1000>;
 			status = "disabled";
 			interrupts = <0 45 4>;
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] ARM: zynq: DT: Use the zynq binding with macb
  2015-05-27 19:58 [PATCH v2] ARM: zynq: DT: Use the zynq binding with macb Nathan Sullivan
@ 2015-05-28  8:22 ` Russell King - ARM Linux
  0 siblings, 0 replies; 2+ messages in thread
From: Russell King - ARM Linux @ 2015-05-28  8:22 UTC (permalink / raw)
  To: Nathan Sullivan; +Cc: michal.simek, soren.brinkmann, devicetree, linux-kernel

On Wed, May 27, 2015 at 02:58:48PM -0500, Nathan Sullivan wrote:
> Use the new zynq binding for macb ethernet, since it will disable half
> duplex gigabit like the Zynq TRM says to do. Also allow the compatible
> cadence gem binding that won't disable half duplex but works otherwise.
> 
> Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
> ---
>  arch/arm/boot/dts/zynq-7000.dtsi |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
> index a5cd2ed..154bf93 100644
> --- a/arch/arm/boot/dts/zynq-7000.dtsi
> +++ b/arch/arm/boot/dts/zynq-7000.dtsi
> @@ -57,7 +57,7 @@
>  		regulator-always-on;
>  	};
>  
> -	amba {
> +	amba@0 {
>  		compatible = "simple-bus";
>  		#address-cells = <1>;
>  		#size-cells = <1>;

ePAPR (which we follow on ARM) requires a reg= property if you have
an '@' number.

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-05-28  8:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-27 19:58 [PATCH v2] ARM: zynq: DT: Use the zynq binding with macb Nathan Sullivan
2015-05-28  8:22 ` Russell King - ARM Linux

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).