3af779eb17
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.11, and Linux v3.12. This work mainly covers: * Ground work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family,and the Armada family. * Further updates to the mvebu MBus. * Work and ground work for enabling MSI on the Armada family. * some phy / mdio bus initialization related work. * Device tree binding documentation update. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39565
127 lines
3.4 KiB
Diff
127 lines
3.4 KiB
Diff
From d967b31469239f610ea84b0a54ce296c15d860e9 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Tue, 30 Jul 2013 16:59:02 +0200
|
|
Subject: [PATCH 068/203] 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>
|
|
---
|
|
arch/arm/boot/dts/armada-370.dtsi | 6 +++---
|
|
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 4 ++--
|
|
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 6 +++---
|
|
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 6 +++---
|
|
4 files changed, 11 insertions(+), 11 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/armada-370.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-370.dtsi
|
|
@@ -136,7 +136,7 @@
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
- #interrupts-cells = <2>;
|
|
+ #interrupt-cells = <2>;
|
|
interrupts = <82>, <83>, <84>, <85>;
|
|
};
|
|
|
|
@@ -147,7 +147,7 @@
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
- #interrupts-cells = <2>;
|
|
+ #interrupt-cells = <2>;
|
|
interrupts = <87>, <88>, <89>, <90>;
|
|
};
|
|
|
|
@@ -158,7 +158,7 @@
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
- #interrupts-cells = <2>;
|
|
+ #interrupt-cells = <2>;
|
|
interrupts = <91>;
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
|
|
@@ -181,7 +181,7 @@
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
- #interrupts-cells = <2>;
|
|
+ #interrupt-cells = <2>;
|
|
interrupts = <82>, <83>, <84>, <85>;
|
|
};
|
|
|
|
@@ -192,7 +192,7 @@
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
- #interrupts-cells = <2>;
|
|
+ #interrupt-cells = <2>;
|
|
interrupts = <87>, <88>, <89>;
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
|
|
@@ -203,7 +203,7 @@
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
- #interrupts-cells = <2>;
|
|
+ #interrupt-cells = <2>;
|
|
interrupts = <82>, <83>, <84>, <85>;
|
|
};
|
|
|
|
@@ -214,7 +214,7 @@
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
- #interrupts-cells = <2>;
|
|
+ #interrupt-cells = <2>;
|
|
interrupts = <87>, <88>, <89>, <90>;
|
|
};
|
|
|
|
@@ -225,7 +225,7 @@
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
- #interrupts-cells = <2>;
|
|
+ #interrupt-cells = <2>;
|
|
interrupts = <91>;
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
|
|
@@ -301,7 +301,7 @@
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
- #interrupts-cells = <2>;
|
|
+ #interrupt-cells = <2>;
|
|
interrupts = <82>, <83>, <84>, <85>;
|
|
};
|
|
|
|
@@ -312,7 +312,7 @@
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
- #interrupts-cells = <2>;
|
|
+ #interrupt-cells = <2>;
|
|
interrupts = <87>, <88>, <89>, <90>;
|
|
};
|
|
|
|
@@ -323,7 +323,7 @@
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
- #interrupts-cells = <2>;
|
|
+ #interrupt-cells = <2>;
|
|
interrupts = <91>;
|
|
};
|
|
|