summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorNathan Sullivan <nathan.sullivan@ni.com>2015-05-22 09:22:11 -0500
committerDavid S. Miller <davem@davemloft.net>2015-05-22 15:04:33 -0400
commit9eeb5161397a54580a630c99841b5badb07cf246 (patch)
tree8ec4be26793b9754f8c4d74da3d77401450c3ab6 /arch/arm
parent222ca8e0c183309081bdb0fd5827fc2a922be3ad (diff)
downloadlinux-stable-9eeb5161397a54580a630c99841b5badb07cf246.tar.gz
linux-stable-9eeb5161397a54580a630c99841b5badb07cf246.tar.bz2
linux-stable-9eeb5161397a54580a630c99841b5badb07cf246.zip
ARM: zynq: DT: Use the zynq binding with macb
Use the new zynq binding for macb ethernet, since it will disable half duplex gigabit like the Zynq TRM says to do. Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/zynq-7000.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index a5cd2eda3edf..9ea54b3dba09 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -193,7 +193,7 @@
};
gem0: ethernet@e000b000 {
- compatible = "cdns,gem";
+ compatible = "cdns,zynq-gem";
reg = <0xe000b000 0x1000>;
status = "disabled";
interrupts = <0 22 4>;
@@ -204,7 +204,7 @@
};
gem1: ethernet@e000c000 {
- compatible = "cdns,gem";
+ compatible = "cdns,zynq-gem";
reg = <0xe000c000 0x1000>;
status = "disabled";
interrupts = <0 45 4>;