diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2015-07-22 10:51:16 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2015-07-28 11:56:23 +0200 |
| commit | 7e163363fb1c2e22f1eb3ee7334df93bbae8f920 (patch) | |
| tree | 74319ec7879079c582367b5041ba008d3fe3d35f /arch/arm/dts | |
| parent | 08305feb8e0448ed86611cf8a593f65c00724945 (diff) | |
| download | blackbird-obmc-uboot-7e163363fb1c2e22f1eb3ee7334df93bbae8f920.tar.gz blackbird-obmc-uboot-7e163363fb1c2e22f1eb3ee7334df93bbae8f920.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. 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>
Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/zynq-7000.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi index a8bbe48754..383ddd674b 100644 --- a/arch/arm/dts/zynq-7000.dtsi +++ b/arch/arm/dts/zynq-7000.dtsi @@ -192,7 +192,7 @@ }; gem0: ethernet@e000b000 { - compatible = "cdns,gem"; + compatible = "cdns,zynq-gem", "cdns,gem"; reg = <0xe000b000 0x1000>; status = "disabled"; interrupts = <0 22 4>; @@ -201,7 +201,7 @@ }; gem1: ethernet@e000c000 { - compatible = "cdns,gem"; + compatible = "cdns,zynq-gem", "cdns,gem"; reg = <0xe000c000 0x1000>; status = "disabled"; interrupts = <0 45 4>; |
