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 tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
spi
/
spi-sun4i.txt
diff --git
a/Documentation/devicetree/bindings/spi/spi-sun4i.txt
b/Documentation/devicetree/bindings/spi/spi-sun4i.txt
index de827f5a301e49133df378e55e685f3d44eec9f9..484bbff5337e17a9d5976b3984734619e0f75296 100644
(file)
--- a/
Documentation/devicetree/bindings/spi/spi-sun4i.txt
+++ b/
Documentation/devicetree/bindings/spi/spi-sun4i.txt
@@
-18,7
+18,6
@@
spi1: spi@01c06000 {
interrupts = <11>;
clocks = <&ahb_gates 21>, <&spi1_clk>;
clock-names = "ahb", "mod";
- status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
};