diff options
author | Iyappan Subramanian <isubramanian@apm.com> | 2014-10-13 20:05:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-14 16:09:21 -0400 |
commit | 4c2e7f0954dcd9fbb47d065c654d44608dad38e0 (patch) | |
tree | 89807c0f2cbab244a25f441fb68d7a89a8166b8c /arch/arm64 | |
parent | c15952dc18d8a293d976ac6c06d44d9d98023b45 (diff) |
dtb: Add SGMII based 1GbE node to APM X-Gene SoC device tree
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/boot/dts/apm-mustang.dts | 4 | ||||
-rw-r--r-- | arch/arm64/boot/dts/apm-storm.dtsi | 24 |
2 files changed, 28 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/apm-mustang.dts b/arch/arm64/boot/dts/apm-mustang.dts index 2ae782bbdf0f..71a1489619c2 100644 --- a/arch/arm64/boot/dts/apm-mustang.dts +++ b/arch/arm64/boot/dts/apm-mustang.dts | |||
@@ -33,6 +33,10 @@ | |||
33 | status = "ok"; | 33 | status = "ok"; |
34 | }; | 34 | }; |
35 | 35 | ||
36 | &sgenet0 { | ||
37 | status = "ok"; | ||
38 | }; | ||
39 | |||
36 | &xgenet { | 40 | &xgenet { |
37 | status = "ok"; | 41 | status = "ok"; |
38 | }; | 42 | }; |
diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi index d16cc03b7c5d..f45bbfe116d8 100644 --- a/arch/arm64/boot/dts/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm-storm.dtsi | |||
@@ -176,6 +176,16 @@ | |||
176 | clock-output-names = "menetclk"; | 176 | clock-output-names = "menetclk"; |
177 | }; | 177 | }; |
178 | 178 | ||
179 | sge0clk: sge0clk@1f21c000 { | ||
180 | compatible = "apm,xgene-device-clock"; | ||
181 | #clock-cells = <1>; | ||
182 | clocks = <&socplldiv2 0>; | ||
183 | reg = <0x0 0x1f21c000 0x0 0x1000>; | ||
184 | reg-names = "csr-reg"; | ||
185 | csr-mask = <0x3>; | ||
186 | clock-output-names = "sge0clk"; | ||
187 | }; | ||
188 | |||
179 | xge0clk: xge0clk@1f61c000 { | 189 | xge0clk: xge0clk@1f61c000 { |
180 | compatible = "apm,xgene-device-clock"; | 190 | compatible = "apm,xgene-device-clock"; |
181 | #clock-cells = <1>; | 191 | #clock-cells = <1>; |
@@ -446,6 +456,20 @@ | |||
446 | }; | 456 | }; |
447 | }; | 457 | }; |
448 | 458 | ||
459 | sgenet0: ethernet@1f210000 { | ||
460 | compatible = "apm,xgene-enet"; | ||
461 | status = "disabled"; | ||
462 | reg = <0x0 0x1f210000 0x0 0x10000>, | ||
463 | <0x0 0x1f200000 0x0 0X10000>, | ||
464 | <0x0 0x1B000000 0x0 0X20000>; | ||
465 | reg-names = "enet_csr", "ring_csr", "ring_cmd"; | ||
466 | interrupts = <0x0 0xA0 0x4>; | ||
467 | dma-coherent; | ||
468 | clocks = <&sge0clk 0>; | ||
469 | local-mac-address = [00 00 00 00 00 00]; | ||
470 | phy-connection-type = "sgmii"; | ||
471 | }; | ||
472 | |||
449 | xgenet: ethernet@1f610000 { | 473 | xgenet: ethernet@1f610000 { |
450 | compatible = "apm,xgene-enet"; | 474 | compatible = "apm,xgene-enet"; |
451 | status = "disabled"; | 475 | status = "disabled"; |