diff options
| author | Nathan Sullivan <nathan.sullivan@ni.com> | 2015-05-27 22:00:01 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2015-05-28 08:47:28 +0200 |
| commit | 4481b18b7cf023c57085b3c7db762dc4d7f1873b (patch) | |
| tree | 4a646dcb8250db874966a26de6c3701482b27e94 /arch/arm/boot/dts/zynq-7000.dtsi | |
| parent | of: Add vendor prefix for Ceva (diff) | |
| download | linux-4481b18b7cf023c57085b3c7db762dc4d7f1873b.tar.xz linux-4481b18b7cf023c57085b3c7db762dc4d7f1873b.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/boot/dts/zynq-7000.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/zynq-7000.dtsi | 4 |
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..06915080b875 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", "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>; |