diff options
| author | Olof Johansson <olof@lixom.net> | 2015-03-29 22:58:04 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-03-29 22:58:14 +0200 |
| commit | ebc0aa8fd5e7c5b3d9831eec58e11439516ff35b (patch) | |
| tree | 467e283333e598365b18aba2481f9e5ea79cefaf | |
| parent | arm64: juno: Fix misleading name of UART reference clock (diff) | |
| parent | ARM: socfpga: dts: fix spi1 interrupt (diff) | |
| download | linux-ebc0aa8fd5e7c5b3d9831eec58e11439516ff35b.tar.xz linux-ebc0aa8fd5e7c5b3d9831eec58e11439516ff35b.zip | |
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>
| -rw-r--r-- | arch/arm/boot/dts/socfpga.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index 9d8760956752..d9176e606173 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"; |