diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-07-30 10:59:02 -0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-08-16 09:02:07 -0400 |
| commit | ca60985c0042ec391fa7e6131b2894ed5638feab (patch) | |
| tree | 178ebc2a55115f6d8950add1f463ddbbccd4f990 | |
| parent | eee47b7c6eb44861fe9a6c7052fd8243a4beaea6 (diff) | |
ARM: mvebu: use correct #interrupt-cells instead of #interrupts-cells
The Device Tree information for the GPIO banks of the Armada 370 and
Armada XP SOCs was incorrectly using #interrupts-cells instead of
controller when using GPIO interrupts, since the GPIO bank DT node
wasn't recognized as a valid interrupt controller by the OF code.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| -rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78230.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78260.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78460.dtsi | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index fa3dfc6b4c6a..e8deeab34b33 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi | |||
| @@ -78,7 +78,7 @@ | |||
| 78 | gpio-controller; | 78 | gpio-controller; |
| 79 | #gpio-cells = <2>; | 79 | #gpio-cells = <2>; |
| 80 | interrupt-controller; | 80 | interrupt-controller; |
| 81 | #interrupts-cells = <2>; | 81 | #interrupt-cells = <2>; |
| 82 | interrupts = <82>, <83>, <84>, <85>; | 82 | interrupts = <82>, <83>, <84>, <85>; |
| 83 | }; | 83 | }; |
| 84 | 84 | ||
| @@ -89,7 +89,7 @@ | |||
| 89 | gpio-controller; | 89 | gpio-controller; |
| 90 | #gpio-cells = <2>; | 90 | #gpio-cells = <2>; |
| 91 | interrupt-controller; | 91 | interrupt-controller; |
| 92 | #interrupts-cells = <2>; | 92 | #interrupt-cells = <2>; |
| 93 | interrupts = <87>, <88>, <89>, <90>; | 93 | interrupts = <87>, <88>, <89>, <90>; |
| 94 | }; | 94 | }; |
| 95 | 95 | ||
| @@ -100,7 +100,7 @@ | |||
| 100 | gpio-controller; | 100 | gpio-controller; |
| 101 | #gpio-cells = <2>; | 101 | #gpio-cells = <2>; |
| 102 | interrupt-controller; | 102 | interrupt-controller; |
| 103 | #interrupts-cells = <2>; | 103 | #interrupt-cells = <2>; |
| 104 | interrupts = <91>; | 104 | interrupts = <91>; |
| 105 | }; | 105 | }; |
| 106 | 106 | ||
diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi index f8eaa383e07f..ab40f961384f 100644 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi | |||
| @@ -63,7 +63,7 @@ | |||
| 63 | gpio-controller; | 63 | gpio-controller; |
| 64 | #gpio-cells = <2>; | 64 | #gpio-cells = <2>; |
| 65 | interrupt-controller; | 65 | interrupt-controller; |
| 66 | #interrupts-cells = <2>; | 66 | #interrupt-cells = <2>; |
| 67 | interrupts = <82>, <83>, <84>, <85>; | 67 | interrupts = <82>, <83>, <84>, <85>; |
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| @@ -74,7 +74,7 @@ | |||
| 74 | gpio-controller; | 74 | gpio-controller; |
| 75 | #gpio-cells = <2>; | 75 | #gpio-cells = <2>; |
| 76 | interrupt-controller; | 76 | interrupt-controller; |
| 77 | #interrupts-cells = <2>; | 77 | #interrupt-cells = <2>; |
| 78 | interrupts = <87>, <88>, <89>; | 78 | interrupts = <87>, <88>, <89>; |
| 79 | }; | 79 | }; |
| 80 | 80 | ||
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index 2d9335da210c..254bd24191b6 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi | |||
| @@ -64,7 +64,7 @@ | |||
| 64 | gpio-controller; | 64 | gpio-controller; |
| 65 | #gpio-cells = <2>; | 65 | #gpio-cells = <2>; |
| 66 | interrupt-controller; | 66 | interrupt-controller; |
| 67 | #interrupts-cells = <2>; | 67 | #interrupt-cells = <2>; |
| 68 | interrupts = <82>, <83>, <84>, <85>; | 68 | interrupts = <82>, <83>, <84>, <85>; |
| 69 | }; | 69 | }; |
| 70 | 70 | ||
| @@ -75,7 +75,7 @@ | |||
| 75 | gpio-controller; | 75 | gpio-controller; |
| 76 | #gpio-cells = <2>; | 76 | #gpio-cells = <2>; |
| 77 | interrupt-controller; | 77 | interrupt-controller; |
| 78 | #interrupts-cells = <2>; | 78 | #interrupt-cells = <2>; |
| 79 | interrupts = <87>, <88>, <89>, <90>; | 79 | interrupts = <87>, <88>, <89>, <90>; |
| 80 | }; | 80 | }; |
| 81 | 81 | ||
| @@ -86,7 +86,7 @@ | |||
| 86 | gpio-controller; | 86 | gpio-controller; |
| 87 | #gpio-cells = <2>; | 87 | #gpio-cells = <2>; |
| 88 | interrupt-controller; | 88 | interrupt-controller; |
| 89 | #interrupts-cells = <2>; | 89 | #interrupt-cells = <2>; |
| 90 | interrupts = <91>; | 90 | interrupts = <91>; |
| 91 | }; | 91 | }; |
| 92 | 92 | ||
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi index c7b1f4d5c1c7..9bb9620e425e 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi | |||
| @@ -80,7 +80,7 @@ | |||
| 80 | gpio-controller; | 80 | gpio-controller; |
| 81 | #gpio-cells = <2>; | 81 | #gpio-cells = <2>; |
| 82 | interrupt-controller; | 82 | interrupt-controller; |
| 83 | #interrupts-cells = <2>; | 83 | #interrupt-cells = <2>; |
| 84 | interrupts = <82>, <83>, <84>, <85>; | 84 | interrupts = <82>, <83>, <84>, <85>; |
| 85 | }; | 85 | }; |
| 86 | 86 | ||
| @@ -91,7 +91,7 @@ | |||
| 91 | gpio-controller; | 91 | gpio-controller; |
| 92 | #gpio-cells = <2>; | 92 | #gpio-cells = <2>; |
| 93 | interrupt-controller; | 93 | interrupt-controller; |
| 94 | #interrupts-cells = <2>; | 94 | #interrupt-cells = <2>; |
| 95 | interrupts = <87>, <88>, <89>, <90>; | 95 | interrupts = <87>, <88>, <89>, <90>; |
| 96 | }; | 96 | }; |
| 97 | 97 | ||
| @@ -102,7 +102,7 @@ | |||
| 102 | gpio-controller; | 102 | gpio-controller; |
| 103 | #gpio-cells = <2>; | 103 | #gpio-cells = <2>; |
| 104 | interrupt-controller; | 104 | interrupt-controller; |
| 105 | #interrupts-cells = <2>; | 105 | #interrupt-cells = <2>; |
| 106 | interrupts = <91>; | 106 | interrupts = <91>; |
| 107 | }; | 107 | }; |
| 108 | 108 | ||