diff options
author | Keyur Chudgar <kchudgar@apm.com> | 2015-03-17 14:27:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-18 12:44:05 -0400 |
commit | 2d33394e23d63b750dcba40e5feaeba425427b52 (patch) | |
tree | 5900a7298bb544b49a19dd2da992e3ba0178c206 /arch | |
parent | c2bc6e11bb945e3b10f07bf4b00525ccdc9fc440 (diff) |
dtb: xgene: Add second SGMII based 1G interface node
- Added new SGMII node for port 1
- Added port-id field
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm64/boot/dts/apm/apm-mustang.dts | 4 | ||||
-rw-r--r-- | arch/arm64/boot/dts/apm/apm-storm.dtsi | 25 |
2 files changed, 29 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/apm/apm-mustang.dts b/arch/arm64/boot/dts/apm/apm-mustang.dts index 2e25de0800b9..83578e766b94 100644 --- a/arch/arm64/boot/dts/apm/apm-mustang.dts +++ b/arch/arm64/boot/dts/apm/apm-mustang.dts | |||
@@ -45,6 +45,10 @@ | |||
45 | status = "ok"; | 45 | status = "ok"; |
46 | }; | 46 | }; |
47 | 47 | ||
48 | &sgenet1 { | ||
49 | status = "ok"; | ||
50 | }; | ||
51 | |||
48 | &xgenet { | 52 | &xgenet { |
49 | status = "ok"; | 53 | status = "ok"; |
50 | }; | 54 | }; |
diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi index a857794432d6..c1eb6911e539 100644 --- a/arch/arm64/boot/dts/apm/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi | |||
@@ -186,6 +186,16 @@ | |||
186 | clock-output-names = "sge0clk"; | 186 | clock-output-names = "sge0clk"; |
187 | }; | 187 | }; |
188 | 188 | ||
189 | sge1clk: sge1clk@1f21c000 { | ||
190 | compatible = "apm,xgene-device-clock"; | ||
191 | #clock-cells = <1>; | ||
192 | clocks = <&socplldiv2 0>; | ||
193 | reg = <0x0 0x1f21c000 0x0 0x1000>; | ||
194 | reg-names = "csr-reg"; | ||
195 | csr-mask = <0xc>; | ||
196 | clock-output-names = "sge1clk"; | ||
197 | }; | ||
198 | |||
189 | xge0clk: xge0clk@1f61c000 { | 199 | xge0clk: xge0clk@1f61c000 { |
190 | compatible = "apm,xgene-device-clock"; | 200 | compatible = "apm,xgene-device-clock"; |
191 | #clock-cells = <1>; | 201 | #clock-cells = <1>; |
@@ -635,6 +645,21 @@ | |||
635 | phy-connection-type = "sgmii"; | 645 | phy-connection-type = "sgmii"; |
636 | }; | 646 | }; |
637 | 647 | ||
648 | sgenet1: ethernet@1f210030 { | ||
649 | compatible = "apm,xgene1-sgenet"; | ||
650 | status = "disabled"; | ||
651 | reg = <0x0 0x1f210030 0x0 0xd100>, | ||
652 | <0x0 0x1f200000 0x0 0Xc300>, | ||
653 | <0x0 0x1B000000 0x0 0X8000>; | ||
654 | reg-names = "enet_csr", "ring_csr", "ring_cmd"; | ||
655 | interrupts = <0x0 0xAC 0x4>; | ||
656 | port-id = <1>; | ||
657 | dma-coherent; | ||
658 | clocks = <&sge1clk 0>; | ||
659 | local-mac-address = [00 00 00 00 00 00]; | ||
660 | phy-connection-type = "sgmii"; | ||
661 | }; | ||
662 | |||
638 | xgenet: ethernet@1f610000 { | 663 | xgenet: ethernet@1f610000 { |
639 | compatible = "apm,xgene1-xgenet"; | 664 | compatible = "apm,xgene1-xgenet"; |
640 | status = "disabled"; | 665 | status = "disabled"; |