summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlessio Igor Bogani <alessio.bogani@elettra.eu>2016-05-03 14:31:18 +0200
committerScott Wood <oss@buserror.net>2016-05-17 01:45:39 +0200
commit1eef33bec12d7e46a58f12b3604556a80c362a0d (patch)
tree97f96a5096806903391a91ad83d0713e23d394a5 /arch
parentpowerpc/86xx: Move pci1 definition to the include file (diff)
downloadlinux-1eef33bec12d7e46a58f12b3604556a80c362a0d.tar.xz
linux-1eef33bec12d7e46a58f12b3604556a80c362a0d.zip
powerpc/86xx: Fix PCI interrupt map definition
Fix PCI interrupt map definition from 2 to 4 cells. Move interrupt-map and interrupt-map-mask and clone interrupts into the pcie child nodes. Signed-off-by: Alessio Igor Bogani <alessio.bogani@elettra.eu> Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi32
1 files changed, 16 insertions, 16 deletions
diff --git a/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
index a76ffda57f8e..eeb7c65d5f22 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
@@ -102,14 +102,6 @@
bus-range = <0x0 0xff>;
clock-frequency = <100000000>;
interrupts = <24 2 0 0>;
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-
- interrupt-map = <
- 0x0000 0x0 0x0 0x1 &mpic 0x0 0x1
- 0x0000 0x0 0x0 0x2 &mpic 0x1 0x1
- 0x0000 0x0 0x0 0x3 &mpic 0x2 0x1
- 0x0000 0x0 0x0 0x4 &mpic 0x3 0x1
- >;
pcie@0 {
reg = <0 0 0 0 0>;
@@ -117,6 +109,14 @@
#size-cells = <2>;
#address-cells = <3>;
device_type = "pci";
+ interrupts = <24 2 0 0>;
+ interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map = <
+ 0x0000 0x0 0x0 0x1 &mpic 0x0 0x1 0x0 0x0
+ 0x0000 0x0 0x0 0x2 &mpic 0x1 0x1 0x0 0x0
+ 0x0000 0x0 0x0 0x3 &mpic 0x2 0x1 0x0 0x0
+ 0x0000 0x0 0x0 0x4 &mpic 0x3 0x1 0x0 0x0
+ >;
};
};
@@ -128,14 +128,6 @@
bus-range = <0x0 0xff>;
clock-frequency = <100000000>;
interrupts = <25 2 0 0>;
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-
- interrupt-map = <
- 0x0000 0x0 0x0 0x1 &mpic 0x4 0x1
- 0x0000 0x0 0x0 0x2 &mpic 0x5 0x1
- 0x0000 0x0 0x0 0x3 &mpic 0x6 0x1
- 0x0000 0x0 0x0 0x4 &mpic 0x7 0x1
- >;
pcie@0 {
reg = <0 0 0 0 0>;
@@ -143,5 +135,13 @@
#size-cells = <2>;
#address-cells = <3>;
device_type = "pci";
+ interrupts = <25 2 0 0>;
+ interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map = <
+ 0x0000 0x0 0x0 0x1 &mpic 0x4 0x1 0x0 0x0
+ 0x0000 0x0 0x0 0x2 &mpic 0x5 0x1 0x0 0x0
+ 0x0000 0x0 0x0 0x3 &mpic 0x6 0x1 0x0 0x0
+ 0x0000 0x0 0x0 0x4 &mpic 0x7 0x1 0x0 0x0
+ >;
};
};