diff options
author | Iyappan Subramanian <isubramanian@apm.com> | 2014-10-09 21:32:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-10 15:06:59 -0400 |
commit | 5fb32417b7e52d2e6d5f5c64d277a03e5c998a02 (patch) | |
tree | 58840226c6e9f157f7a56bb494bbdf01f4aa1963 /arch/arm64/boot | |
parent | 5239b978b686e336a501680c80399e4786ac12fc (diff) |
dtb: Add 10GbE node to APM X-Gene SoC device tree
Added 10GbE interface and clock nodes.
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/boot')
-rw-r--r-- | arch/arm64/boot/dts/apm-mustang.dts | 4 | ||||
-rw-r--r-- | arch/arm64/boot/dts/apm-storm.dtsi | 29 |
2 files changed, 31 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/apm-mustang.dts b/arch/arm64/boot/dts/apm-mustang.dts index b2f56229aa5e..2ae782bbdf0f 100644 --- a/arch/arm64/boot/dts/apm-mustang.dts +++ b/arch/arm64/boot/dts/apm-mustang.dts | |||
@@ -32,3 +32,7 @@ | |||
32 | &menet { | 32 | &menet { |
33 | status = "ok"; | 33 | status = "ok"; |
34 | }; | 34 | }; |
35 | |||
36 | &xgenet { | ||
37 | status = "ok"; | ||
38 | }; | ||
diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi index f391972ad135..d16cc03b7c5d 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 | xge0clk: xge0clk@1f61c000 { | ||
180 | compatible = "apm,xgene-device-clock"; | ||
181 | #clock-cells = <1>; | ||
182 | clocks = <&socplldiv2 0>; | ||
183 | reg = <0x0 0x1f61c000 0x0 0x1000>; | ||
184 | reg-names = "csr-reg"; | ||
185 | csr-mask = <0x3>; | ||
186 | clock-output-names = "xge0clk"; | ||
187 | }; | ||
188 | |||
179 | sataphy1clk: sataphy1clk@1f21c000 { | 189 | sataphy1clk: sataphy1clk@1f21c000 { |
180 | compatible = "apm,xgene-device-clock"; | 190 | compatible = "apm,xgene-device-clock"; |
181 | #clock-cells = <1>; | 191 | #clock-cells = <1>; |
@@ -420,7 +430,8 @@ | |||
420 | interrupts = <0x0 0x3c 0x4>; | 430 | interrupts = <0x0 0x3c 0x4>; |
421 | dma-coherent; | 431 | dma-coherent; |
422 | clocks = <&menetclk 0>; | 432 | clocks = <&menetclk 0>; |
423 | local-mac-address = [00 01 73 00 00 01]; | 433 | /* mac address will be overwritten by the bootloader */ |
434 | local-mac-address = [00 00 00 00 00 00]; | ||
424 | phy-connection-type = "rgmii"; | 435 | phy-connection-type = "rgmii"; |
425 | phy-handle = <&menetphy>; | 436 | phy-handle = <&menetphy>; |
426 | mdio { | 437 | mdio { |
@@ -435,12 +446,26 @@ | |||
435 | }; | 446 | }; |
436 | }; | 447 | }; |
437 | 448 | ||
449 | xgenet: ethernet@1f610000 { | ||
450 | compatible = "apm,xgene-enet"; | ||
451 | status = "disabled"; | ||
452 | reg = <0x0 0x1f610000 0x0 0xd100>, | ||
453 | <0x0 0x1f600000 0x0 0X400>, | ||
454 | <0x0 0x18000000 0x0 0X200>; | ||
455 | reg-names = "enet_csr", "ring_csr", "ring_cmd"; | ||
456 | interrupts = <0x0 0x60 0x4>; | ||
457 | dma-coherent; | ||
458 | clocks = <&xge0clk 0>; | ||
459 | /* mac address will be overwritten by the bootloader */ | ||
460 | local-mac-address = [00 00 00 00 00 00]; | ||
461 | phy-connection-type = "xgmii"; | ||
462 | }; | ||
463 | |||
438 | rng: rng@10520000 { | 464 | rng: rng@10520000 { |
439 | compatible = "apm,xgene-rng"; | 465 | compatible = "apm,xgene-rng"; |
440 | reg = <0x0 0x10520000 0x0 0x100>; | 466 | reg = <0x0 0x10520000 0x0 0x100>; |
441 | interrupts = <0x0 0x41 0x4>; | 467 | interrupts = <0x0 0x41 0x4>; |
442 | clocks = <&rngpkaclk 0>; | 468 | clocks = <&rngpkaclk 0>; |
443 | }; | 469 | }; |
444 | |||
445 | }; | 470 | }; |
446 | }; | 471 | }; |