projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
78d84bc
)
Merge tag 'socfpga_fix_for_v4.0_2' of git://git.rocketboards.org/linux-socfpga-next...
author
Olof Johansson
<olof@lixom.net>
Sun, 29 Mar 2015 20:58:04 +0000
(13:58 -0700)
committer
Olof Johansson
<olof@lixom.net>
Sun, 29 Mar 2015 20:58:14 +0000
(13:58 -0700)
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
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/socfpga.dtsi
b/arch/arm/boot/dts/socfpga.dtsi
index 9d87609567523efd0c0e75033e8bf9e73079d6bd..d9176e6061731b7c42ee792338fab3509482c603 100644
(file)
--- 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 15
6
4>;
+ interrupts = <0 15
5
4>;
num-cs = <4>;
clocks = <&spi_m_clk>;
status = "disabled";