commit ebc0aa8fd5e7c5b3d9831eec58e11439516ff35b
author Olof Johansson <olof@lixom.net> Sun Mar 29 13:58:04 2015 -0700
committer Olof Johansson <olof@lixom.net> Sun Mar 29 13:58:14 2015 -0700
tree 467e283333e598365b18aba2481f9e5ea79cefaf
parent 78d84bc3734c2566dbba09baae2414734661ed6a
parent 1ac31de744202a3a14601170a57f155b4a8d2c21

Merge tag 'socfpga_fix_for_v4.0_2' of git://git.rocketboards.org/linux-socfpga-next into fixes

Late fix for v4.0 on the SoCFPGA platform:
- Fix interrupt number for SPI1 interface

* tag 'socfpga_fix_for_v4.0_2' of git://git.rocketboards.org/linux-socfpga-next:
  ARM: socfpga: dts: fix spi1 interrupt

Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/boot/dts/socfpga.dtsi

diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index 9d87609..d9176e6 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -660,7 +660,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0xfff01000 0x1000>;
-			interrupts = <0 156 4>;
+			interrupts = <0 155 4>;
 			num-cs = <4>;
 			clocks = <&spi_m_clk>;
 			status = "disabled";