aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-01-30 18:50:17 -0500
committerPaul Mackerras <paulus@samba.org>2008-01-30 18:50:17 -0500
commit4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (patch)
treeb8ddfaa3401a6af36ab06829b1b0c31e0ff2fb38
parentcda13dd164f91df79ba797ab84848352b03de115 (diff)
parent4fb4c5582475452d3bf7c5072ef2d15ee06f7723 (diff)
Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx
Diffstat
-rw-r--r--arch/powerpc/boot/dts/cm5200.dts60
-rw-r--r--arch/powerpc/boot/dts/lite5200.dts96
-rw-r--r--arch/powerpc/boot/dts/lite5200b.dts93
-rw-r--r--arch/powerpc/boot/dts/motionpro.dts68
-rw-r--r--arch/powerpc/boot/dts/tqm5200.dts45
-rw-r--r--arch/powerpc/boot/serial.c2
-rw-r--r--arch/powerpc/kernel/prom_init.c149
-rw-r--r--arch/powerpc/platforms/52xx/Kconfig41
-rw-r--r--arch/powerpc/platforms/52xx/efika.c3
-rw-r--r--arch/powerpc/platforms/52xx/lite5200.c28
-rw-r--r--arch/powerpc/platforms/52xx/lite5200_pm.c9
-rw-r--r--arch/powerpc/platforms/52xx/mpc5200_simple.c6
-rw-r--r--arch/powerpc/platforms/52xx/mpc52xx_common.c117
-rw-r--r--arch/powerpc/platforms/52xx/mpc52xx_pci.c10
-rw-r--r--arch/powerpc/platforms/52xx/mpc52xx_pic.c16
-rw-r--r--arch/powerpc/platforms/52xx/mpc52xx_pm.c9
-rw-r--r--arch/powerpc/sysdev/bestcomm/bestcomm.c16
-rw-r--r--arch/ppc/syslib/mpc52xx_setup.c36
-rw-r--r--drivers/ata/pata_mpc52xx.c6
-rw-r--r--drivers/net/fec_mpc52xx.c6
-rw-r--r--drivers/net/fec_mpc52xx_phy.c8
-rw-r--r--drivers/serial/mpc52xx_uart.c4
-rw-r--r--drivers/spi/mpc52xx_psc_spi.c82
-rw-r--r--drivers/usb/host/ohci-ppc-of.c2
-rw-r--r--include/asm-powerpc/mpc52xx.h9
25 files changed, 478 insertions, 443 deletions
diff --git a/arch/powerpc/boot/dts/cm5200.dts b/arch/powerpc/boot/dts/cm5200.dts
index 9295083d1ce9..30737eafe68e 100644
--- a/arch/powerpc/boot/dts/cm5200.dts
+++ b/arch/powerpc/boot/dts/cm5200.dts
@@ -45,17 +45,16 @@
45 }; 45 };
46 46
47 soc5200@f0000000 { 47 soc5200@f0000000 {
48 model = "fsl,mpc5200b"; 48 #address-cells = <1>;
49 compatible = "fsl,mpc5200b"; 49 #size-cells = <1>;
50 revision = ""; // from bootloader 50 compatible = "fsl,mpc5200b-immr";
51 device_type = "soc";
52 ranges = <0 f0000000 0000c000>; 51 ranges = <0 f0000000 0000c000>;
53 reg = <f0000000 00000100>; 52 reg = <f0000000 00000100>;
54 bus-frequency = <0>; // from bootloader 53 bus-frequency = <0>; // from bootloader
55 system-frequency = <0>; // from bootloader 54 system-frequency = <0>; // from bootloader
56 55
57 cdm@200 { 56 cdm@200 {
58 compatible = "mpc5200b-cdm","mpc5200-cdm"; 57 compatible = "fsl,mpc5200b-cdm","fsl,mpc5200-cdm";
59 reg = <200 38>; 58 reg = <200 38>;
60 }; 59 };
61 60
@@ -63,11 +62,11 @@
63 // 5200 interrupts are encoded into two levels; 62 // 5200 interrupts are encoded into two levels;
64 interrupt-controller; 63 interrupt-controller;
65 #interrupt-cells = <3>; 64 #interrupt-cells = <3>;
66 compatible = "mpc5200b-pic","mpc5200-pic"; 65 compatible = "fsl,mpc5200b-pic","fsl,mpc5200-pic";
67 reg = <500 80>; 66 reg = <500 80>;
68 }; 67 };
69 68
70 gpt@600 { // General Purpose Timer 69 timer@600 { // General Purpose Timer
71 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; 70 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
72 reg = <600 10>; 71 reg = <600 10>;
73 interrupts = <1 9 0>; 72 interrupts = <1 9 0>;
@@ -75,49 +74,49 @@
75 fsl,has-wdt; 74 fsl,has-wdt;
76 }; 75 };
77 76
78 gpt@610 { // General Purpose Timer 77 timer@610 { // General Purpose Timer
79 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; 78 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
80 reg = <610 10>; 79 reg = <610 10>;
81 interrupts = <1 a 0>; 80 interrupts = <1 a 0>;
82 interrupt-parent = <&mpc5200_pic>; 81 interrupt-parent = <&mpc5200_pic>;
83 }; 82 };
84 83
85 gpt@620 { // General Purpose Timer 84 timer@620 { // General Purpose Timer
86 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; 85 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
87 reg = <620 10>; 86 reg = <620 10>;
88 interrupts = <1 b 0>; 87 interrupts = <1 b 0>;
89 interrupt-parent = <&mpc5200_pic>; 88 interrupt-parent = <&mpc5200_pic>;
90 }; 89 };
91 90
92 gpt@630 { // General Purpose Timer 91 timer@630 { // General Purpose Timer
93 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; 92 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
94 reg = <630 10>; 93 reg = <630 10>;
95 interrupts = <1 c 0>; 94 interrupts = <1 c 0>;
96 interrupt-parent = <&mpc5200_pic>; 95 interrupt-parent = <&mpc5200_pic>;
97 }; 96 };
98 97
99 gpt@640 { // General Purpose Timer 98 timer@640 { // General Purpose Timer
100 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; 99 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
101 reg = <640 10>; 100 reg = <640 10>;
102 interrupts = <1 d 0>; 101 interrupts = <1 d 0>;
103 interrupt-parent = <&mpc5200_pic>; 102 interrupt-parent = <&mpc5200_pic>;
104 }; 103 };
105 104
106 gpt@650 { // General Purpose Timer 105 timer@650 { // General Purpose Timer
107 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; 106 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
108 reg = <650 10>; 107 reg = <650 10>;
109 interrupts = <1 e 0>; 108 interrupts = <1 e 0>;
110 interrupt-parent = <&mpc5200_pic>; 109 interrupt-parent = <&mpc5200_pic>;
111 }; 110 };
112 111
113 gpt@660 { // General Purpose Timer 112 timer@660 { // General Purpose Timer
114 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; 113 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
115 reg = <660 10>; 114 reg = <660 10>;
116 interrupts = <1 f 0>; 115 interrupts = <1 f 0>;
117 interrupt-parent = <&mpc5200_pic>; 116 interrupt-parent = <&mpc5200_pic>;
118 }; 117 };
119 118
120 gpt@670 { // General Purpose Timer 119 timer@670 { // General Purpose Timer
121 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; 120 compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
122 reg = <670 10>; 121 reg = <670 10>;
123 interrupts = <1 10 0>; 122 interrupts = <1 10 0>;
@@ -125,43 +124,42 @@
125 }; 124 };
126 125
127 rtc@800 { // Real time clock 126 rtc@800 { // Real time clock
128 compatible = "mpc5200b-rtc","mpc5200-rtc"; 127 compatible = "fsl,mpc5200b-rtc","fsl,mpc5200-rtc";
129 reg = <800 100>; 128 reg = <800 100>;
130 interrupts = <1 5 0 1 6 0>; 129 interrupts = <1 5 0 1 6 0>;
131 interrupt-parent = <&mpc5200_pic>; 130 interrupt-parent = <&mpc5200_pic>;
132 }; 131 };
133 132
134 gpio@b00 { 133 gpio@b00 {
135 compatible = "mpc5200b-gpio","mpc5200-gpio"; 134 compatible = "fsl,mpc5200b-gpio","fsl,mpc5200-gpio";
136 reg = <b00 40>; 135 reg = <b00 40>;
137 interrupts = <1 7 0>; 136 interrupts = <1 7 0>;