aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/powerpc/boot/dts/mpc8272ads.dts376
-rw-r--r--arch/powerpc/kernel/irq.c4
-rw-r--r--arch/powerpc/platforms/8xx/m8xx_setup.c72
-rw-r--r--arch/powerpc/sysdev/commproc.c20
-rw-r--r--arch/powerpc/sysdev/cpm2_common.c2
5 files changed, 238 insertions, 236 deletions
diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts
index 1934b800278e..4d09dcad2537 100644
--- a/arch/powerpc/boot/dts/mpc8272ads.dts
+++ b/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -10,207 +10,209 @@
10 */ 10 */
11 11
12/ { 12/ {
13 model = "MPC8272ADS"; 13 model = "MPC8272ADS";
14 compatible = "MPC8260ADS"; 14 compatible = "MPC8260ADS";
15 #address-cells = <1>; 15 #address-cells = <1>;
16 #size-cells = <1>; 16 #size-cells = <1>;
17 17
18 cpus { 18 cpus {
19 #address-cells = <1>; 19 #address-cells = <1>;
20 #size-cells = <0>; 20 #size-cells = <0>;
21 21
22 PowerPC,8272@0 { 22 PowerPC,8272@0 {
23 device_type = "cpu"; 23 device_type = "cpu";
24 reg = <0>; 24 reg = <0>;
25 d-cache-line-size = <20>; // 32 bytes 25 d-cache-line-size = <20>; // 32 bytes
26 i-cache-line-size = <20>; // 32 bytes 26 i-cache-line-size = <20>; // 32 bytes
27 d-cache-size = <4000>; // L1, 16K 27 d-cache-size = <4000>; // L1, 16K
28 i-cache-size = <4000>; // L1, 16K 28 i-cache-size = <4000>; // L1, 16K
29 timebase-frequency = <0>; 29 timebase-frequency = <0>;
30 bus-frequency = <0>; 30 bus-frequency = <0>;
31 clock-frequency = <0>; 31 clock-frequency = <0>;
32 32-bit; 32 32-bit;
33 }; 33 };
34 }; 34 };
35 35
36 pci_pic: interrupt-controller@f8200000 { 36 pci_pic: interrupt-controller@f8200000 {
37 #address-cells = <0>; 37 #address-cells = <0>;
38 #interrupt-cells = <2>; 38 #interrupt-cells = <2>;
39 interrupt-controller; 39 interrupt-controller;
40 reg = <f8200000 f8200004>; 40 reg = <f8200000 f8200004>;
41 built-in; 41 built-in;
42 device_type = "pci-pic"; 42 device_type = "pci-pic";
43 }; 43 };
44 memory { 44
45 device_type = "memory"; 45 memory {
46 reg = <00000000 4000000 f4500000 00000020>; 46 device_type = "memory";
47 }; 47 reg = <00000000 4000000 f4500000 00000020>;
48 48 };
49 chosen { 49
50 name = "chosen"; 50 chosen {
51 linux,platform = <0>; 51 name = "chosen";
52 linux,platform = <0>;
52 interrupt-controller = <&Cpm_pic>; 53 interrupt-controller = <&Cpm_pic>;
53 }; 54 };
54 55
55 soc8272@f0000000 { 56 soc8272@f0000000 {
56 #address-cells = <1>; 57 #address-cells = <1>;
57 #size-cells = <1>; 58 #size-cells = <1>;
58 #interrupt-cells = <2>; 59 #interrupt-cells = <2>;
59 device_type = "soc"; 60 device_type = "soc";
60 ranges = <00000000 f0000000 00053000>; 61 ranges = <00000000 f0000000 00053000>;
61 reg = <f0000000 10000>; 62 reg = <f0000000 10000>;
62 63
63 mdio@0 { 64 mdio@0 {
64 device_type = "mdio"; 65 device_type = "mdio";
65 compatible = "fs_enet"; 66 compatible = "fs_enet";
66 reg = <0 0>; 67 reg = <0 0>;
67 #address-cells = <1>; 68 #address-cells = <1>;
68 #size-cells = <0>; 69 #size-cells = <0>;
70
69 phy0:ethernet-phy@0 { 71 phy0:ethernet-phy@0 {
70 interrupt-parent = <&Cpm_pic>; 72 interrupt-parent = <&Cpm_pic>;
71 interrupts = <17 4>; 73 interrupts = <17 4>;
72 reg = <0>; 74 reg = <0>;
73 bitbang = [ 12 12 13 02 02 01 ]; 75 bitbang = [ 12 12 13 02 02 01 ];
74 device_type = "ethernet-phy"; 76 device_type = "ethernet-phy";
75 }; 77 };
78
76 phy1:ethernet-phy@1 { 79 phy1:ethernet-phy@1 {
77 interrupt-parent = <&Cpm_pic>; 80 interrupt-parent = <&Cpm_pic>;
78 interrupts = <17 4>; 81 interrupts = <17 4>;
79 bitbang = [ 12 12 13 02 02 01 ]; 82 bitbang = [ 12 12 13 02 02 01 ];
80 reg = <3>; 83 reg = <3>;
81 device_type = "ethernet-phy"; 84 device_type = "ethernet-phy";
82 }; 85 };
83 }; 86 };
84 87
85 ethernet@24000 { 88 ethernet@24000 {
86 #address-cells = <1>; 89 #address-cells = <1>;
87 #size-cells = <0>; 90 #size-cells = <0>;
88 device_type = "network"; 91 device_type = "network";
89 device-id = <1>; 92 device-id = <1>;
90 compatible = "fs_enet"; 93 compatible = "fs_enet";
91 model = "FCC"; 94 model = "FCC";
92 reg = <11300 20 8400 100 11380 30>; 95 reg = <11300 20 8400 100 11380 30>;
93 mac-address = [ 00 11 2F 99 43 54 ]; 96 mac-address = [ 00 11 2F 99 43 54 ];
94 interrupts = <20 2>; 97 interrupts = <20 2>;
95 interrupt-parent = <&Cpm_pic>; 98 interrupt-parent = <&Cpm_pic>;
96 phy-handle = <&Phy0>; 99 phy-handle = <&Phy0>;
97 rx-clock = <13>; 100 rx-clock = <13>;
98 tx-clock = <12>; 101 tx-clock = <12>;
99 }; 102 };
100 103
101 ethernet@25000 { 104 ethernet@25000 {
102 device_type = "network"; 105 device_type = "network";
103 device-id = <2>; 106 device-id = <2>;
104 compatible = "fs_enet"; 107 compatible = "fs_enet";
105 model = "FCC"; 108 model = "FCC";
106 reg = <11320 20 8500 100 113b0 30>; 109 reg = <11320 20 8500 100 113b0 30>;
107 mac-address = [ 00 11 2F 99 44 54 ]; 110 mac-address = [ 00 11 2F 99 44 54 ];
108 interrupts = <21 2>; 111 interrupts = <21 2>;
109 interrupt-parent = <&Cpm_pic>; 112 interrupt-parent = <&Cpm_pic>;
110 phy-handle = <&Phy1>; 113 phy-handle = <&Phy1>;
111 rx-clock = <17>; 114 rx-clock = <17>;
112 tx-clock = <18>; 115 tx-clock = <18>;
113 }; 116 };
114 117
115 cpm@f0000000 { 118 cpm@f0000000 {
116 #address-cells = <1>; 119 #address-cells = <1>;
117 #size-cells = <1>; 120 #size-cells = <1>;
118 #interrupt-cells = <2>; 121 #interrupt-cells = <2>;
119 device_type = "cpm"; 122 device_type = "cpm";
120 model = "CPM2"; 123 model = "CPM2";
121 ranges = <00000000 00000000 20000>; 124 ranges = <00000000 00000000 20000>;
122 reg = <0 20000>; 125 reg = <0 20000>;
123 command-proc = <119c0>; 126 command-proc = <119c0>;
124 brg-frequency = <17D7840>; 127 brg-frequency = <17D7840>;
125 cpm_clk = <BEBC200>; 128 cpm_clk = <BEBC200>;
126 129
127 scc@11a00 { 130 scc@11a00 {
128 device_type = "serial"; 131 device_type = "serial";
129 compatible = "cpm_uart"; 132 compatible = "cpm_uart";
130 model = "SCC"; 133 model = "SCC";
131 device-id = <1>; 134 device-id = <1>;
132 reg = <11a00 20 8000 100>; 135 reg = <11a00 20 8000 100>;
133 current-speed = <1c200>; 136 current-speed = <1c200>;
134 interrupts = <28 2>; 137 interrupts = <28 2>;
135 interrupt-parent = <&Cpm_pic>; 138 interrupt-parent = <&Cpm_pic>;
136 clock-setup = <0 00ffffff>; 139 clock-setup = <0 00ffffff>;
137 rx-clock = <1>; 140 rx-clock = <1>;
138 tx-clock = <1>; 141 tx-clock = <1>;
139 }; 142 };
140 143
141 scc@11a60 { 144 scc@11a60 {
142 device_type = "serial"; 145 device_type = "serial";
143 compatible = "cpm_uart"; 146 compatible = "cpm_uart";
144 model = "SCC"; 147 model = "SCC";
145 device-id = <4>; 148 device-id = <4>;
146 reg = <11a60 20 8300 100>; 149 reg = <11a60 20 8300 100>;
147 current-speed = <1c200>; 150 current-speed = <1c200>;
148 interrupts = <2b 2>; 151 interrupts = <2b 2>;
149 interrupt-parent = <&Cpm_pic>; 152 interrupt-parent = <&Cpm_pic>;
150 clock-setup = <1b ffffff00>; 153 clock-setup = <1b ffffff00>;
151 rx-clock = <4>; 154 rx-clock = <4>;
152 tx-clock = <4>; 155 tx-clock = <4>;
153 }; 156 };
154 157 };
155 }; 158
156 cpm_pic:interrupt-controller@10c00 { 159 cpm_pic:interrupt-controller@10c00 {
157 #address-cells = <0>; 160 #address-cells = <0>;
158 #interrupt-cells = <2>; 161 #interrupt-cells = <2>;
159 interrupt-controller; 162 interrupt-controller;
160 reg = <10c00 80>; 163 reg = <10c00 80>;
161 built-in; 164 built-in;
162 device_type = "cpm-pic"; 165 device_type = "cpm-pic";
163 compatible = "CPM2"; 166 compatible = "CPM2";
164 }; 167 };
165 pci@0500 { 168
166 #interrupt-cells = <1>; 169 pci@0500 {
167 #size-cells = <2>; 170 #interrupt-cells = <1>;
168 #address-cells = <3>; 171 #size-cells = <2>;
169 compatible = "8272"; 172 #address-cells = <3>;
170 device_type = "pci"; 173 compatible = "8272";
171 reg = <10430 4dc>; 174 device_type = "pci";
172 clock-frequency = <3f940aa>; 175 reg = <10430 4dc>;
173 interrupt-map-mask = <f800 0 0 7>; 176 clock-frequency = <3f940aa>;
174 interrupt-map = < 177 interrupt-map-mask = <f800 0 0 7>;
175 178 interrupt-map = <
176 /* IDSEL 0x16 */ 179 /* IDSEL 0x16 */
177 b000 0 0 1 f8200000 40 8 180 b000 0 0 1 f8200000 40 8
178 b000 0 0 2 f8200000 41 8 181 b000 0 0 2 f8200000 41 8
179 b000 0 0 3 f8200000 42 8 182 b000 0 0 3 f8200000 42 8
180 b000 0 0 4 f8200000 43 8 183 b000 0 0 4 f8200000 43 8
181 184
182 /* IDSEL 0x17 */ 185 /* IDSEL 0x17 */
183 b800 0 0 1 f8200000 43 8 186 b800 0 0 1 f8200000 43 8
184 b800 0 0 2 f8200000 40 8 187 b800 0 0 2 f8200000 40 8
185 b800 0 0 3 f8200000 41 8 188 b800 0 0 3 f8200000 41 8
186 b800 0 0 4 f8200000 42 8 189 b800 0 0 4 f8200000 42 8
187 190
188 /* IDSEL 0x18 */ 191 /* IDSEL 0x18 */
189 c000 0 0 1 f8200000 42 8 192 c000 0 0 1 f8200000 42 8
190 c000 0 0 2 f8200000 43 8 193 c000 0 0 2 f8200000 43 8
191 c000 0 0 3 f8200000 40 8 194 c000 0 0 3 f8200000 40 8
192 c000 0 0 4 f8200000 41 8>; 195 c000 0 0 4 f8200000 41 8>;
193 interrupt-parent = <&Cpm_pic>; 196 interrupt-parent = <&Cpm_pic>;
194 interrupts = <14 8>; 197 interrupts = <14 8>;
195 bus-range = <0 0>; 198 bus-range = <0 0>;
196 ranges = <02000000 0 80000000 80000000 0 40000000 199 ranges = <02000000 0 80000000 80000000 0 40000000
197 01000000 0 00000000 f6000000 0 02000000>; 200 01000000 0 00000000 f6000000 0 02000000>;
198 }; 201 };
199 202
200/* May need to remove if on a part without crypto engine */ 203/* May need to remove if on a part without crypto engine */
201 crypto@30000 { 204 crypto@30000 {
202 device_type = "crypto"; 205 device_type = "crypto";
203 model = "SEC2"; 206 model = "SEC2";
204 compatible = "talitos"; 207 compatible = "talitos";
205 reg = <30000 10000>; 208 reg = <30000 10000>;
206 interrupts = <b 2>; 209 interrupts = <b 2>;
207 interrupt-parent = <&Cpm_pic>; 210 interrupt-parent = <&Cpm_pic>;
208 num-channels = <4>; 211 num-channels = <4>;
209 channel-fifo-len = <18>; 212 channel-fifo-len = <18>;
210 exec-units-mask = <0000007e>; 213 exec-units-mask = <0000007e>;
211/* desc mask is for rev1.x, we need runtime fixup for >=2.x */ 214/* desc mask is for rev1.x, we need runtime fixup for >=2.x */
212 descriptor-types-mask = <01010ebf>; 215 descriptor-types-mask = <01010ebf>;
213 }; 216 };
214 217 };
215 };
216}; 218};
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 24bea97c736c..dfad0e469eec 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -272,7 +272,7 @@ void do_IRQ(struct pt_regs *regs)
272 struct thread_info *curtp, *irqtp; 272 struct thread_info *curtp, *irqtp;
273#endif 273#endif
274 274
275 irq_enter(); 275 irq_enter();
276 276
277#ifdef CONFIG_DEBUG_STACKOVERFLOW 277#ifdef CONFIG_DEBUG_STACKOVERFLOW
278 /* Debugging check for stack overflow: is there less than 2KB free? */ 278 /* Debugging check for stack overflow: is there less than 2KB free? */
@@ -321,7 +321,7 @@ void do_IRQ(struct pt_regs *regs)
321 /* That's not SMP safe ... but who cares ? */ 321 /* That's not SMP safe ... but who cares ? */
322 ppc_spurious_interrupts++; 322 ppc_spurious_interrupts++;
323 323
324 irq_exit(); 324 irq_exit();
325 set_irq_regs(old_regs); 325 set_irq_regs(old_regs);
326 326
327#ifdef CONFIG_PPC_ISERIES 327#ifdef CONFIG_PPC_ISERIES
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index f1693550c70c..601b389b570b 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -89,24 +89,24 @@ init_internal_rtc(void)
89 89
90static int __init get_freq(char *name, unsigned long *val) 90static int __init get_freq(char *name, unsigned long *val)
91{ 91{
92 struct device_node *cpu; 92 struct device_node *cpu;
93 const unsigned int *fp; 93 const unsigned int *fp;
94 int found = 0; 94 int found = 0;
95 95
96 /* The cpu node should have timebase and clock frequency properties */ 96 /* The cpu node should have timebase and clock frequency properties */
97 cpu = of_find_node_by_type(NULL, "cpu"); 97 cpu = of_find_node_by_type(NULL, "cpu");
98 98
99 if (cpu) { 99 if (cpu) {
100 fp = of_get_property(cpu, name, NULL); 100 fp = of_get_property(cpu, name, NULL);
101 if (fp) { 101 if (fp) {
102 found = 1; 102 found = 1;
103 *val = *fp; 103 *val = *fp;
104 } 104 }
105 105
106 of_node_put(cpu); 106 of_node_put(cpu);
107 } 107 }
108 108
109 return found; 109 return found;
110} 110}
111 111
112/* The decrementer counts at the system (internal) clock frequency divided by 112/* The decrementer counts at the system (internal) clock frequency divided by
@@ -122,7 +122,7 @@ void __init mpc8xx_calibrate_decr(void)
122 sit8xx_t *sys_tmr2; 122 sit8xx_t *sys_tmr2;
123 int irq, virq; 123 int irq, virq;
124 124
125 clk_r1 = (cark8xx_t *) immr_map(im_clkrstk); 125 clk_r1 = (cark8xx_t *) immr_map(im_clkrstk);
126 126
127 /* Unlock the SCCR. */ 127 /* Unlock the SCCR. */
128 out_be32(&clk_r1->cark_sccrk, ~KAPWR_KEY); 128 out_be32(&clk_r1->cark_sccrk, ~KAPWR_KEY);
@@ -130,24 +130,24 @@ void __init mpc8xx_calibrate_decr(void)
130 immr_unmap(clk_r1); 130 immr_unmap(clk_r1);
131 131
132 /* Force all 8xx processors to use divide by 16 processor clock. */ 132 /* Force all 8xx processors to use divide by 16 processor clock. */
133 clk_r2 = (car8xx_t *) immr_map(im_clkrst); 133 clk_r2 = (car8xx_t *) immr_map(im_clkrst);
134 setbits32(&clk_r2->car_sccr, 0x02000000); 134 setbits32(&clk_r2->car_sccr, 0x02000000);
135 immr_unmap(clk_r2); 135 immr_unmap(clk_r2);
136 136
137 /* Processor frequency is MHz. 137 /* Processor frequency is MHz.
138 */ 138 */
139 ppc_tb_freq = 50000000; 139 ppc_tb_freq = 50000000;
140 if (!get_freq("bus-frequency", &ppc_tb_freq)) { 140 if (!get_freq("bus-frequency", &ppc_tb_freq)) {
141 printk(KERN_ERR "WARNING: Estimating decrementer frequency " 141 printk(KERN_ERR "WARNING: Estimating decrementer frequency "
142 "(not found)\n"); 142 "(not found)\n");
143 } 143 }
144 ppc_tb_freq /= 16; 144 ppc_tb_freq /= 16;
145 ppc_proc_freq = 50000000; 145 ppc_proc_freq = 50000000;
146 if (!get_freq("clock-frequency", &ppc_proc_freq)) 146 if (!get_freq("clock-frequency", &ppc_proc_freq))
147 printk(KERN_ERR "WARNING: Estimating processor frequency" 147 printk(KERN_ERR "WARNING: Estimating processor frequency"
148 "(not found)\n"); 148 "(not found)\n");
149 149
150 printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq); 150 printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);
151 151
152 /* Perform some more timer/timebase initialization. This used 152 /* Perform some more timer/timebase initialization. This used
153 * to be done elsewhere, but other changes caused it to get 153 * to be done elsewhere, but other changes caused it to get
@@ -164,7 +164,7 @@ void __init mpc8xx_calibrate_decr(void)
164 * we guarantee the registers are locked, then we unlock them 164 * we guarantee the registers are locked, then we unlock them
165 * for our use. 165 * for our use.
166 */ 166 */
167 sys_tmr1 = (sitk8xx_t *) immr_map(im_sitk); 167 sys_tmr1 = (sitk8xx_t *) immr_map(im_sitk);
168 out_be32(&sys_tmr1->sitk_tbscrk, ~KAPWR_KEY); 168 out_be32(&sys_tmr1->sitk_tbscrk, ~KAPWR_KEY);
169 out_be32(&sys_tmr1->sitk_rtcsck, ~KAPWR_KEY); 169 out_be32(&sys_tmr1->sitk_rtcsck, ~KAPWR_KEY);
170 out_be32(&sys_tmr1->sitk_tbk, ~KAPWR_KEY); 170 out_be32(&sys_tmr1->sitk_tbk, ~KAPWR_KEY);
@@ -180,8 +180,8 @@ void __init mpc8xx_calibrate_decr(void)
180 * we have to enable the timebase). The decrementer interrupt 180 * we have to enable the timebase). The decrementer interrupt
181 * is wired into the vector table, nothing to do here for that. 181 * is wired into the vector table, nothing to do here for that.
182 */ 182 */
183 cpu = of_find_node_by_type(NULL, "cpu"); 183 cpu = of_find_node_by_type(NULL, "cpu");
184 virq= irq_of_parse_and_map(cpu, 0); 184 virq= irq_of_parse_and_map(cpu, 0);
185 irq = irq_map[virq].hwirq; 185 irq = irq_map[virq].hwirq;
186 186
187 sys_tmr2 = (sit8xx_t *) immr_map(im_sit); 187 sys_tmr2 = (sit8xx_t *) immr_map(im_sit);
@@ -211,10 +211,10 @@ int mpc8xx_set_rtc_time(struct rtc_time *tm)
211 sit8xx_t *sys_tmr2; 211 sit8xx_t *sys_tmr2;
212 int time; 212 int time;
213 213
214 sys_tmr1 = (sitk8xx_t *) immr_map(im_sitk); 214 sys_tmr1 = (sitk8xx_t *) immr_map(im_sitk);
215 sys_tmr2 = (sit8xx_t *) immr_map(im_sit); 215 sys_tmr2 = (sit8xx_t *) immr_map(im_sit);
216 time = mktime(tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, 216 time = mktime(tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
217 tm->tm_hour, tm->tm_min, tm->tm_sec); 217 tm->tm_hour, tm->tm_min, tm->tm_sec);
218 218
219 out_be32(&sys_tmr1->sitk_rtck, KAPWR_KEY); 219 out_be32(&sys_tmr1->sitk_rtck, KAPWR_KEY);
220 out_be32(&sys_tmr2->sit_rtc, time); 220 out_be32(&sys_tmr2->sit_rtc, time);
@@ -233,8 +233,8 @@ void mpc8xx_get_rtc_time(struct rtc_time *tm)
233 /* Get time from the RTC. */ 233 /* Get time from the RTC. */
234 data = in_be32(&sys_tmr->sit_rtc); 234 data = in_be32(&sys_tmr->sit_rtc);
235 to_tm(data, tm); 235 to_tm(data, tm);
236 tm->tm_year -= 1900; 236 tm->tm_year -= 1900;
237 tm->tm_mon -= 1; 237 tm->tm_mon -= 1;
238 immr_unmap(sys_tmr); 238 immr_unmap(sys_tmr);
239 return; 239 return;
240} 240}
@@ -298,7 +298,7 @@ void __init m8xx_pic_init(void)
298 int irq; 298 int irq;
299 299
300 if (mpc8xx_pic_init()) { 300 if (mpc8xx_pic_init()) {
301 printk(KERN_ERR "Failed interrupt 8xx controller initialization\n"); 301 printk(KERN_ERR "Failed interrupt 8xx controller initialization\n");
302 return; 302 return;
303 } 303 }
304 304
diff --git a/arch/powerpc/sysdev/commproc.c b/arch/powerpc/sysdev/commproc.c
index 4f67b89ba1d0..e8e79f83d198 100644
--- a/arch/powerpc/sysdev/commproc.c
+++ b/arch/powerpc/sysdev/commproc.c
@@ -45,10 +45,10 @@
45#define CPM_MAP_SIZE (0x4000) 45#define CPM_MAP_SIZE (0x4000)
46 46
47static void m8xx_cpm_dpinit(void); 47static void m8xx_cpm_dpinit(void);
48static uint host_buffer; /* One page of host buffer */ 48static uint host_buffer; /* One page of host buffer */
49static uint host_end; /* end + 1 */ 49static uint host_end; /* end + 1 */
50cpm8xx_t *cpmp; /* Pointer to comm processor space */ 50cpm8xx_t *cpmp; /* Pointer to comm processor space */
51cpic8xx_t *cpic_reg; 51cpic8xx_t *cpic_reg;
52 52
53static struct device_node *cpm_pic_node; 53static struct device_node *cpm_pic_node;
54static struct irq_host *cpm_pic_host; 54static struct irq_host *cpm_pic_host;
@@ -115,7 +115,7 @@ static int cpm_pic_host_map(struct irq_host *h, unsigned int virq,
115 * and return. This is a no-op function so we don't need any special 115 * and return. This is a no-op function so we don't need any special
116 * tests in the interrupt handler. 116 * tests in the interrupt handler.
117 */ 117 */
118static irqreturn_t cpm_error_interrupt(int irq, void *dev) 118static irqreturn_t cpm_error_interrupt(int irq, void *dev)
119{ 119{
120 return IRQ_HANDLED; 120 return IRQ_HANDLED;
121} 121}
@@ -181,7 +181,7 @@ unsigned int cpm_pic_init(void)
181 printk(KERN_ERR "CPM PIC init: can not find cpm node\n"); 181 printk(KERN_ERR "CPM PIC init: can not find cpm node\n");
182 goto end; 182 goto end;
183 } 183 }
184 eirq= irq_of_parse_and_map(np, 0); 184 eirq = irq_of_parse_and_map(np, 0);
185 if (eirq == NO_IRQ) 185 if (eirq == NO_IRQ)
186 goto end; 186 goto end;
187 187
@@ -197,15 +197,15 @@ end:
197 197
198void cpm_reset(void) 198void cpm_reset(void)
199{ 199{
200 cpm8xx_t *commproc; 200 cpm8xx_t *commproc;
201 sysconf8xx_t *siu_conf; 201 sysconf8xx_t *siu_conf;
202 202
203 commproc = (cpm8xx_t *)ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE); 203 commproc = (cpm8xx_t *)ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE);
204 204
205#ifdef CONFIG_UCODE_PATCH 205#ifdef CONFIG_UCODE_PATCH
206 /* Perform a reset. 206 /* Perform a reset.
207 */ 207 */
208 out_be16(&commproc->cp_cpcr, CPM_CR_RST | CPM_CR_FLG); 208 out_be16(&commproc->cp_cpcr, CPM_CR_RST | CPM_CR_FLG);
209 209
210 /* Wait for it. 210 /* Wait for it.
211 */ 211 */
@@ -307,7 +307,7 @@ static rh_block_t cpm_boot_dpmem_rh_block[16];
307static rh_info_t cpm_dpmem_info; 307static rh_info_t cpm_dpmem_info;
308 308
309#define CPM_DPMEM_ALIGNMENT 8 309#define CPM_DPMEM_ALIGNMENT 8
310static u8* dpram_vbase; 310static u8 *dpram_vbase;
311static uint dpram_pbase; 311static uint dpram_pbase;
312 312
313void m8xx_cpm_dpinit(void) 313void m8xx_cpm_dpinit(void)
diff --git a/arch/powerpc/sysdev/cpm2_common.c b/arch/powerpc/sysdev/cpm2_common.c
index 924412974795..dbe8d1802189 100644
--- a/arch/powerpc/sysdev/cpm2_common.c
+++ b/arch/powerpc/sysdev/cpm2_common.c
@@ -201,7 +201,7 @@ int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode)
201 } 201 }
202 202
203 if (mode == CPM_CLK_RX) 203 if (mode == CPM_CLK_RX)
204 shift +=3; 204 shift += 3;
205 205
206 for (i=0; i<24; i++) { 206 for (i=0; i<24; i++) {
207 if (clk_map[i][0] == target && clk_map[i][1] == clock) { 207 if (clk_map[i][0] == target && clk_map[i][1] == clock) {
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-20 02:16:56 -0500