diff options
Diffstat (limited to 'arch/powerpc/boot/dts/holly.dts')
-rw-r--r-- | arch/powerpc/boot/dts/holly.dts | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/arch/powerpc/boot/dts/holly.dts b/arch/powerpc/boot/dts/holly.dts index 254499b107f4..80a4fab8ee37 100644 --- a/arch/powerpc/boot/dts/holly.dts +++ b/arch/powerpc/boot/dts/holly.dts | |||
@@ -46,7 +46,7 @@ | |||
46 | 46 | ||
47 | tsi109@c0000000 { | 47 | tsi109@c0000000 { |
48 | device_type = "tsi-bridge"; | 48 | device_type = "tsi-bridge"; |
49 | compatible = "tsi-bridge"; | 49 | compatible = "tsi109-bridge", "tsi108-bridge"; |
50 | #address-cells = <1>; | 50 | #address-cells = <1>; |
51 | #size-cells = <1>; | 51 | #size-cells = <1>; |
52 | ranges = <00000000 c0000000 00010000>; | 52 | ranges = <00000000 c0000000 00010000>; |
@@ -54,52 +54,55 @@ | |||
54 | 54 | ||
55 | i2c@7000 { | 55 | i2c@7000 { |
56 | device_type = "i2c"; | 56 | device_type = "i2c"; |
57 | compatible = "tsi-i2c"; | 57 | compatible = "tsi109-i2c", "tsi108-i2c"; |
58 | interrupt-parent = < &/tsi109@c0000000/pic@7400 >; | 58 | interrupt-parent = <&MPIC>; |
59 | interrupts = <e 2>; | 59 | interrupts = <e 2>; |
60 | reg = <7000 400>; | 60 | reg = <7000 400>; |
61 | }; | 61 | }; |
62 | 62 | ||
63 | mdio@6000 { | 63 | MDIO: mdio@6000 { |
64 | device_type = "mdio"; | 64 | device_type = "mdio"; |
65 | compatible = "tsi-ethernet"; | 65 | compatible = "tsi109-mdio", "tsi108-mdio"; |
66 | reg = <6000 50>; | ||
67 | #address-cells = <1>; | ||
68 | #size-cells = <0>; | ||
66 | 69 | ||
67 | PHY1: ethernet-phy@6000 { | 70 | PHY1: ethernet-phy@1 { |
68 | device_type = "ethernet-phy"; | 71 | compatible = "bcm5461a"; |
69 | compatible = "bcm54xx"; | 72 | reg = <1>; |
70 | reg = <6000 50>; | 73 | txc-rxc-delay-disable; |
71 | phy-id = <1>; | ||
72 | }; | 74 | }; |
73 | 75 | ||
74 | PHY2: ethernet-phy@6400 { | 76 | PHY2: ethernet-phy@2 { |
75 | device_type = "ethernet-phy"; | 77 | compatible = "bcm5461a"; |
76 | compatible = "bcm54xx"; | 78 | reg = <2>; |
77 | reg = <6000 50>; | 79 | txc-rxc-delay-disable; |
78 | phy-id = <2>; | ||
79 | }; | 80 | }; |
80 | }; | 81 | }; |
81 | 82 | ||
82 | ethernet@6200 { | 83 | ethernet@6200 { |
83 | device_type = "network"; | 84 | device_type = "network"; |
84 | compatible = "tsi-ethernet"; | 85 | compatible = "tsi109-ethernet", "tsi108-ethernet"; |
85 | #address-cells = <1>; | 86 | #address-cells = <1>; |
86 | #size-cells = <0>; | 87 | #size-cells = <0>; |
87 | reg = <6000 200>; | 88 | reg = <6000 200>; |
88 | local-mac-address = [ 00 00 00 00 00 00 ]; | 89 | local-mac-address = [ 00 00 00 00 00 00 ]; |
89 | interrupt-parent = < &/tsi109@c0000000/pic@7400 >; | 90 | interrupt-parent = <&MPIC>; |
90 | interrupts = <10 2>; | 91 | interrupts = <10 2>; |
92 | mdio-handle = <&MDIO>; | ||
91 | phy-handle = <&PHY1>; | 93 | phy-handle = <&PHY1>; |
92 | }; | 94 | }; |
93 | 95 | ||
94 | ethernet@6600 { | 96 | ethernet@6600 { |
95 | device_type = "network"; | 97 | device_type = "network"; |
96 | compatible = "tsi-ethernet"; | 98 | compatible = "tsi109-ethernet", "tsi108-ethernet"; |
97 | #address-cells = <1>; | 99 | #address-cells = <1>; |
98 | #size-cells = <0>; | 100 | #size-cells = <0>; |
99 | reg = <6400 200>; | 101 | reg = <6400 200>; |
100 | local-mac-address = [ 00 00 00 00 00 00 ]; | 102 | local-mac-address = [ 00 00 00 00 00 00 ]; |
101 | interrupt-parent = < &/tsi109@c0000000/pic@7400 >; | 103 | interrupt-parent = <&MPIC>; |
102 | interrupts = <11 2>; | 104 | interrupts = <11 2>; |
105 | mdio-handle = <&MDIO>; | ||
103 | phy-handle = <&PHY2>; | 106 | phy-handle = <&PHY2>; |
104 | }; | 107 | }; |
105 | 108 | ||
@@ -110,7 +113,7 @@ | |||
110 | virtual-reg = <c0007808>; | 113 | virtual-reg = <c0007808>; |
111 | clock-frequency = <3F9C6000>; | 114 | clock-frequency = <3F9C6000>; |
112 | current-speed = <1c200>; | 115 | current-speed = <1c200>; |
113 | interrupt-parent = < &/tsi109@c0000000/pic@7400 >; | 116 | interrupt-parent = <&MPIC>; |
114 | interrupts = <c 2>; | 117 | interrupts = <c 2>; |
115 | }; | 118 | }; |
116 | 119 | ||
@@ -121,7 +124,7 @@ | |||
121 | virtual-reg = <c0007c08>; | 124 | virtual-reg = <c0007c08>; |
122 | clock-frequency = <3F9C6000>; | 125 | clock-frequency = <3F9C6000>; |
123 | current-speed = <1c200>; | 126 | current-speed = <1c200>; |
124 | interrupt-parent = < &/tsi109@c0000000/pic@7400 >; | 127 | interrupt-parent = <&MPIC>; |
125 | interrupts = <d 2>; | 128 | interrupts = <d 2>; |
126 | }; | 129 | }; |
127 | 130 | ||
@@ -136,7 +139,7 @@ | |||
136 | 139 | ||
137 | pci@1000 { | 140 | pci@1000 { |
138 | device_type = "pci"; | 141 | device_type = "pci"; |
139 | compatible = "tsi109"; | 142 | compatible = "tsi109-pci", "tsi108-pci"; |
140 | #interrupt-cells = <1>; | 143 | #interrupt-cells = <1>; |
141 | #size-cells = <2>; | 144 | #size-cells = <2>; |
142 | #address-cells = <3>; | 145 | #address-cells = <3>; |
@@ -150,7 +153,7 @@ | |||
150 | ranges = <02000000 0 40000000 40000000 0 10000000 | 153 | ranges = <02000000 0 40000000 40000000 0 10000000 |
151 | 01000000 0 00000000 7e000000 0 00010000>; | 154 | 01000000 0 00000000 7e000000 0 00010000>; |
152 | clock-frequency = <7f28154>; | 155 | clock-frequency = <7f28154>; |
153 | interrupt-parent = < &/tsi109@c0000000/pic@7400 >; | 156 | interrupt-parent = <&MPIC>; |
154 | interrupts = <17 2>; | 157 | interrupts = <17 2>; |
155 | interrupt-map-mask = <f800 0 0 7>; | 158 | interrupt-map-mask = <f800 0 0 7>; |
156 | /*----------------------------------------------------+ | 159 | /*----------------------------------------------------+ |
@@ -186,13 +189,12 @@ | |||
186 | #address-cells = <0>; | 189 | #address-cells = <0>; |
187 | #interrupt-cells = <2>; | 190 | #interrupt-cells = <2>; |
188 | interrupts = <17 2>; | 191 | interrupts = <17 2>; |
189 | interrupt-parent = < &/tsi109@c0000000/pic@7400 >; | 192 | interrupt-parent = <&MPIC>; |
190 | }; | 193 | }; |
191 | }; | 194 | }; |
192 | }; | 195 | }; |
193 | 196 | ||
194 | chosen { | 197 | chosen { |
195 | linux,stdout-path = "/tsi109@c0000000/serial@7808"; | 198 | linux,stdout-path = "/tsi109@c0000000/serial@7808"; |
196 | bootargs = "console=ttyS0,115200"; | ||
197 | }; | 199 | }; |
198 | }; | 200 | }; |