git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm2385', 'spi/topic...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
socfpga.dtsi
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";