diff options
author | Steffen Trumtrar <s.trumtrar@pengutronix.de> | 2013-12-11 12:29:49 -0500 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2013-12-12 03:48:12 -0500 |
commit | 982264c3e0bf52e81a2c2b908a81ab0e9b422f32 (patch) | |
tree | b4b19709eaf5643bc7855e41b0ca5f90eab1b919 | |
parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) |
ARM: zynq: add gem support
The zynq includes a Cadence GEM IP core. This is compatible with the macb driver.
Add it to the zynq-7000 DT.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Josh Cartwright <josh.cartwright@ni.com>
[soren: rebased to current Linus tree, added zc706 + zed support, moved phy-mode property to board level dtses]
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r-- | arch/arm/boot/dts/zynq-7000.dtsi | 18 | ||||
-rw-r--r-- | arch/arm/boot/dts/zynq-zc702.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/zynq-zc706.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/zynq-zed.dts | 5 |
4 files changed, 33 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index e7f73b2e4550..aebc48d8c397 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi | |||
@@ -65,6 +65,24 @@ | |||
65 | interrupts = <0 50 4>; | 65 | interrupts = <0 50 4>; |
66 | }; | 66 | }; |
67 | 67 | ||
68 | gem0: ethernet@e000b000 { | ||
69 | compatible = "cdns,gem"; | ||
70 | reg = <0xe000b000 0x4000>; | ||
71 | status = "disabled"; | ||
72 | interrupts = <0 22 4>; | ||
73 | clocks = <&clkc 30>, <&clkc 30>, <&clkc 13>; | ||
74 | clock-names = "pclk", "hclk", "tx_clk"; | ||
75 | }; | ||
76 | |||
77 | gem1: ethernet@e000c000 { | ||
78 | compatible = "cdns,gem"; | ||
79 | reg = <0xe000c000 0x4000>; | ||
80 | status = "disabled"; | ||
81 | interrupts = <0 45 4>; | ||
82 | clocks = <&clkc 31>, <&clkc 31>, <&clkc 14>; | ||
83 | clock-names = "pclk", "hclk", "tx_clk"; | ||
84 | }; | ||
85 | |||
68 | slcr: slcr@f8000000 { | 86 | slcr: slcr@f8000000 { |
69 | compatible = "xlnx,zynq-slcr"; | 87 | compatible = "xlnx,zynq-slcr"; |
70 | reg = <0xF8000000 0x1000>; | 88 | reg = <0xF8000000 0x1000>; |
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index 21aea99a067b..34d680a46b7e 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts | |||
@@ -29,6 +29,11 @@ | |||
29 | 29 | ||
30 | }; | 30 | }; |
31 | 31 | ||
32 | &gem0 { | ||
33 | status = "okay"; | ||
34 | phy-mode = "rgmii"; | ||
35 | }; | ||
36 | |||
32 | &uart1 { | 37 | &uart1 { |
33 | status = "okay"; | 38 | status = "okay"; |
34 | }; | 39 | }; |
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts index 79009e0b74b9..b2835d5fc09a 100644 --- a/arch/arm/boot/dts/zynq-zc706.dts +++ b/arch/arm/boot/dts/zynq-zc706.dts | |||
@@ -30,6 +30,11 @@ | |||
30 | 30 | ||
31 | }; | 31 | }; |
32 | 32 | ||
33 | &gem0 { | ||
34 | status = "okay"; | ||
35 | phy-mode = "rgmii"; | ||
36 | }; | ||
37 | |||
33 | &uart1 { | 38 | &uart1 { |
34 | status = "okay"; | 39 | status = "okay"; |
35 | }; | 40 | }; |
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts index d6acf2b1cdf4..2eda06889dfc 100644 --- a/arch/arm/boot/dts/zynq-zed.dts +++ b/arch/arm/boot/dts/zynq-zed.dts | |||
@@ -30,6 +30,11 @@ | |||
30 | 30 | ||
31 | }; | 31 | }; |
32 | 32 | ||
33 | &gem0 { | ||
34 | status = "okay"; | ||
35 | phy-mode = "rgmii"; | ||
36 | }; | ||
37 | |||
33 | &uart1 { | 38 | &uart1 { |
34 | status = "okay"; | 39 | status = "okay"; |
35 | }; | 40 | }; |