target/linux/mvebu/patches-3.10/0068-ARM-mvebu-use-correct-interrupt-cells-instead-of-int.patch

   1 From d967b31469239f610ea84b0a54ce296c15d860e9 Mon Sep 17 00:00:00 2001
   2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
   3 Date: Tue, 30 Jul 2013 16:59:02 +0200
   4 Subject: [PATCH 068/203] ARM: mvebu: use correct #interrupt-cells instead of
   5  #interrupts-cells
   6
   7 The Device Tree information for the GPIO banks of the Armada 370 and
   8 Armada XP SOCs was incorrectly using #interrupts-cells instead of
   9 controller when using GPIO interrupts, since the GPIO bank DT node
  10 wasn't recognized as a valid interrupt controller by the OF code.
  11
  12 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  13 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  14 ---
  15  arch/arm/boot/dts/armada-370.dtsi        | 6 +++---
  16  arch/arm/boot/dts/armada-xp-mv78230.dtsi | 4 ++--
  17  arch/arm/boot/dts/armada-xp-mv78260.dtsi | 6 +++---
  18  arch/arm/boot/dts/armada-xp-mv78460.dtsi | 6 +++---
  19  4 files changed, 11 insertions(+), 11 deletions(-)
  20
  21 --- a/arch/arm/boot/dts/armada-370.dtsi
  22 +++ b/arch/arm/boot/dts/armada-370.dtsi
  23 @@ -136,7 +136,7 @@
  24                                 gpio-controller;
  25                                 #gpio-cells = <2>;
  26                                 interrupt-controller;
  27 -                               #interrupts-cells = <2>;
  28 +                               #interrupt-cells = <2>;
  29                                 interrupts = <82>, <83>, <84>, <85>;
  30                         };
  31
  32 @@ -147,7 +147,7 @@
  33                                 gpio-controller;
  34                                 #gpio-cells = <2>;
  35                                 interrupt-controller;
  36 -                               #interrupts-cells = <2>;
  37 +                               #interrupt-cells = <2>;
  38                                 interrupts = <87>, <88>, <89>, <90>;
  39                         };
  40
  41 @@ -158,7 +158,7 @@
  42                                 gpio-controller;
  43                                 #gpio-cells = <2>;
  44                                 interrupt-controller;
  45 -                               #interrupts-cells = <2>;
  46 +                               #interrupt-cells = <2>;
  47                                 interrupts = <91>;
  48                         };
  49
  50 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
  51 +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
  52 @@ -181,7 +181,7 @@
  53                                 gpio-controller;
  54                                 #gpio-cells = <2>;
  55                                 interrupt-controller;
  56 -                               #interrupts-cells = <2>;
  57 +                               #interrupt-cells = <2>;
  58                                 interrupts = <82>, <83>, <84>, <85>;
  59                         };
  60
  61 @@ -192,7 +192,7 @@
  62                                 gpio-controller;
  63                                 #gpio-cells = <2>;
  64                                 interrupt-controller;
  65 -                               #interrupts-cells = <2>;
  66 +                               #interrupt-cells = <2>;
  67                                 interrupts = <87>, <88>, <89>;
  68                         };
  69
  70 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
  71 +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
  72 @@ -203,7 +203,7 @@
  73                                 gpio-controller;
  74                                 #gpio-cells = <2>;
  75                                 interrupt-controller;
  76 -                               #interrupts-cells = <2>;
  77 +                               #interrupt-cells = <2>;
  78                                 interrupts = <82>, <83>, <84>, <85>;
  79                         };
  80
  81 @@ -214,7 +214,7 @@
  82                                 gpio-controller;
  83                                 #gpio-cells = <2>;
  84                                 interrupt-controller;
  85 -                               #interrupts-cells = <2>;
  86 +                               #interrupt-cells = <2>;
  87                                 interrupts = <87>, <88>, <89>, <90>;
  88                         };
  89
  90 @@ -225,7 +225,7 @@
  91                                 gpio-controller;
  92                                 #gpio-cells = <2>;
  93                                 interrupt-controller;
  94 -                               #interrupts-cells = <2>;
  95 +                               #interrupt-cells = <2>;
  96                                 interrupts = <91>;
  97                         };
  98
  99 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
 100 +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
 101 @@ -301,7 +301,7 @@
 102                                 gpio-controller;
 103                                 #gpio-cells = <2>;
 104                                 interrupt-controller;
 105 -                               #interrupts-cells = <2>;
 106 +                               #interrupt-cells = <2>;
 107                                 interrupts = <82>, <83>, <84>, <85>;
 108                         };
 109
 110 @@ -312,7 +312,7 @@
 111                                 gpio-controller;
 112                                 #gpio-cells = <2>;
 113                                 interrupt-controller;
 114 -                               #interrupts-cells = <2>;
 115 +                               #interrupt-cells = <2>;
 116                                 interrupts = <87>, <88>, <89>, <90>;
 117                         };
 118
 119 @@ -323,7 +323,7 @@
 120                                 gpio-controller;
 121                                 #gpio-cells = <2>;
 122                                 interrupt-controller;
 123 -                               #interrupts-cells = <2>;
 124 +                               #interrupt-cells = <2>;
 125                                 interrupts = <91>;
 126                         };
 127