summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>2016-11-17 03:30:51 +0200
committerBen Hutchings <ben@decadent.org.uk>2017-03-16 02:26:41 +0000
commitdcef625d42e747c71ba49bf4799d6e0c686ffc3b (patch)
tree7575f59815ad9d32a7637d8f0c37f4f4bb2f6d35 /arch
parent5ebfea6ef6160143025eb9f6cab1fc4f5549a3f7 (diff)
downloadlinux-stable-dcef625d42e747c71ba49bf4799d6e0c686ffc3b.tar.gz
linux-stable-dcef625d42e747c71ba49bf4799d6e0c686ffc3b.tar.bz2
linux-stable-dcef625d42e747c71ba49bf4799d6e0c686ffc3b.zip
ARM: dts: imx31: fix AVIC base address
commit af92305e567b7f4c9cf48b9e46c1f48ec9ffb1fb upstream. On i.MX31 AVIC interrupt controller base address is at 0x68000000. The problem was shadowed by the AVIC driver, which takes the correct base address from a SoC specific header file. Fixes: d2a37b3d91f4 ("ARM i.MX31: Add devicetree support") Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx31.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index 8ec20b49db7e..626e5e374572 100644
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -30,11 +30,11 @@
};
};
- avic: avic-interrupt-controller@60000000 {
+ avic: interrupt-controller@68000000 {
compatible = "fsl,imx31-avic", "fsl,avic";
interrupt-controller;
#interrupt-cells = <1>;
- reg = <0x60000000 0x100000>;
+ reg = <0x68000000 0x100000>;
};
soc {