diff options
author | Paul Mackerras <paulus@samba.org> | 2007-07-26 02:43:24 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-07-26 02:43:24 -0400 |
commit | 46b2835771ad8ef19b8e081e8c90439408c7645f (patch) | |
tree | 4059e1949df40d6c9078bcbe6783b03384ba61f3 /arch/powerpc/boot/dts | |
parent | 9d78592ed72dbff1d8825207f8def07858a49768 (diff) | |
parent | 141707892e92dca69b7b8af65b9367da2d1f8120 (diff) |
Merge branch 'fixes-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc/boot/dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc7448hpc2.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8544ds.dts | 8 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8568mds.dts | 6 |
3 files changed, 15 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/mpc7448hpc2.dts b/arch/powerpc/boot/dts/mpc7448hpc2.dts index 0e3d314a7158..b9158eb2797e 100644 --- a/arch/powerpc/boot/dts/mpc7448hpc2.dts +++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts | |||
@@ -45,7 +45,7 @@ | |||
45 | #address-cells = <1>; | 45 | #address-cells = <1>; |
46 | #size-cells = <1>; | 46 | #size-cells = <1>; |
47 | #interrupt-cells = <2>; | 47 | #interrupt-cells = <2>; |
48 | device_type = "tsi108-bridge"; | 48 | device_type = "tsi-bridge"; |
49 | ranges = <00000000 c0000000 00010000>; | 49 | ranges = <00000000 c0000000 00010000>; |
50 | reg = <c0000000 00010000>; | 50 | reg = <c0000000 00010000>; |
51 | bus-frequency = <0>; | 51 | bus-frequency = <0>; |
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts index 4a900c6df762..4680e2010887 100644 --- a/arch/powerpc/boot/dts/mpc8544ds.dts +++ b/arch/powerpc/boot/dts/mpc8544ds.dts | |||
@@ -104,6 +104,7 @@ | |||
104 | interrupts = <1d 2 1e 2 22 2>; | 104 | interrupts = <1d 2 1e 2 22 2>; |
105 | interrupt-parent = <&mpic>; | 105 | interrupt-parent = <&mpic>; |
106 | phy-handle = <&phy0>; | 106 | phy-handle = <&phy0>; |
107 | phy-connection-type = "rgmii-id"; | ||
107 | }; | 108 | }; |
108 | 109 | ||
109 | ethernet@26000 { | 110 | ethernet@26000 { |
@@ -117,6 +118,7 @@ | |||
117 | interrupts = <1f 2 20 2 21 2>; | 118 | interrupts = <1f 2 20 2 21 2>; |
118 | interrupt-parent = <&mpic>; | 119 | interrupt-parent = <&mpic>; |
119 | phy-handle = <&phy1>; | 120 | phy-handle = <&phy1>; |
121 | phy-connection-type = "rgmii-id"; | ||
120 | }; | 122 | }; |
121 | 123 | ||
122 | serial@4500 { | 124 | serial@4500 { |
@@ -348,6 +350,12 @@ | |||
348 | 350 | ||
349 | }; | 351 | }; |
350 | 352 | ||
353 | global-utilities@e0000 { //global utilities block | ||
354 | compatible = "fsl,mpc8548-guts"; | ||
355 | reg = <e0000 1000>; | ||
356 | fsl,has-rstcr; | ||
357 | }; | ||
358 | |||
351 | mpic: pic@40000 { | 359 | mpic: pic@40000 { |
352 | clock-frequency = <0>; | 360 | clock-frequency = <0>; |
353 | interrupt-controller; | 361 | interrupt-controller; |
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts index 99fa5a0ea425..b1dcfbe8c1f8 100644 --- a/arch/powerpc/boot/dts/mpc8568mds.dts +++ b/arch/powerpc/boot/dts/mpc8568mds.dts | |||
@@ -170,6 +170,12 @@ | |||
170 | interrupt-parent = <&mpic>; | 170 | interrupt-parent = <&mpic>; |
171 | }; | 171 | }; |
172 | 172 | ||
173 | global-utilities@e0000 { //global utilities block | ||
174 | compatible = "fsl,mpc8548-guts"; | ||
175 | reg = <e0000 1000>; | ||
176 | fsl,has-rstcr; | ||
177 | }; | ||
178 | |||
173 | pci@8000 { | 179 | pci@8000 { |
174 | interrupt-map-mask = <f800 0 0 7>; | 180 | interrupt-map-mask = <f800 0 0 7>; |
175 | interrupt-map = < | 181 | interrupt-map = < |