[POWERPC] cpm2: CPM2 interrupt controller fix

This contains important fixes for the CPM2 PIC code. Eliminated
CPM_IRQ_OFFSET, pulling the respective interrupt numbers from the interrupt
mapping. Updated devicetree files to reflect that. Changed direct
IC-related IO accesses to the IO accessors. Fixed all the sense values to
keep coherency with ipic. In the current code, CPM2 stuff will have no IRQs
and hence could be hardly usable.

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index 2b168486aeba..119bd5d3a834 100644
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -200,7 +200,7 @@
                                          a800 0 0 4 40000 31 1>;
 
                         interrupt-parent = <40000>;
-                        interrupts = <42 0>;
+                        interrupts = <8 0>;
                         bus-range = <0 0>;
                         ranges = <02000000 0 80000000 80000000 0 20000000
                                   01000000 0 00000000 e2000000 0 01000000>;
@@ -250,7 +250,7 @@
                                 rx-clock = <1>;
                                 tx-clock = <1>;
                                 current-speed = <1c200>;
-                                interrupts = <64 1>;
+                                interrupts = <28 8>;
                                 interrupt-parent = <90c00>;
                         };
 
@@ -264,7 +264,7 @@
                                 rx-clock = <2>;
                                 tx-clock = <2>;
                                 current-speed = <1c200>;
-                                interrupts = <65 1>;
+                                interrupts = <29 8>;
                                 interrupt-parent = <90c00>;
                         };
 
@@ -278,7 +278,7 @@
                                 clock-setup = <ff00ffff 250000>;
                                 rx-clock = <15>;
                                 tx-clock = <16>;
-                                interrupts = <5d 1>;
+                                interrupts = <21 8>;
                                 interrupt-parent = <90c00>;
                                 phy-handle = <2452002>;
                         };
@@ -293,7 +293,7 @@
                                 clock-setup = <ffff00ff 3700>;
                                 rx-clock = <17>;
                                 tx-clock = <18>;
-                                interrupts = <5e 1>;
+                                interrupts = <22 8>;
                                 interrupt-parent = <90c00>;
                                 phy-handle = <2452003>;
                         };