diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-07-25 00:31:09 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-07-25 00:34:40 -0400 |
commit | 6aeea3ecc33b1f36dbc3b80461d15a7052ae424f (patch) | |
tree | bbd273e3e0ca76094aed8e9c77e5adfe2b07f779 /arch/powerpc/boot/dts/p2020ds.dtsi | |
parent | 9844a5524ec532aee826c35e3031637c7fc8287b (diff) | |
parent | bdc0077af574800d24318b6945cf2344e8dbb050 (diff) |
Merge remote-tracking branch 'origin' into irqdomain/next
Diffstat (limited to 'arch/powerpc/boot/dts/p2020ds.dtsi')
-rw-r--r-- | arch/powerpc/boot/dts/p2020ds.dtsi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/p2020ds.dtsi b/arch/powerpc/boot/dts/p2020ds.dtsi index d3b939c573b0..e699cf95b063 100644 --- a/arch/powerpc/boot/dts/p2020ds.dtsi +++ b/arch/powerpc/boot/dts/p2020ds.dtsi | |||
@@ -150,6 +150,16 @@ | |||
150 | interrupts = <3 1 0 0>; | 150 | interrupts = <3 1 0 0>; |
151 | reg = <0x2>; | 151 | reg = <0x2>; |
152 | }; | 152 | }; |
153 | |||
154 | sgmii_phy1: sgmii-phy@1 { | ||
155 | interrupts = <5 1 0 0>; | ||
156 | reg = <0x1c>; | ||
157 | }; | ||
158 | sgmii_phy2: sgmii-phy@2 { | ||
159 | interrupts = <5 1 0 0>; | ||
160 | reg = <0x1d>; | ||
161 | }; | ||
162 | |||
153 | tbi0: tbi-phy@11 { | 163 | tbi0: tbi-phy@11 { |
154 | reg = <0x11>; | 164 | reg = <0x11>; |
155 | device_type = "tbi-phy"; | 165 | device_type = "tbi-phy"; |