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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
spi
/
efm32-spi.txt
diff --git
a/Documentation/devicetree/bindings/spi/efm32-spi.txt
b/Documentation/devicetree/bindings/spi/efm32-spi.txt
index 750e29aff9bc529ba721a3c842fd85ec37e1e132..2c1e6a43930baa88426aa4822f6ec79ee8bbc10e 100644
(file)
--- a/
Documentation/devicetree/bindings/spi/efm32-spi.txt
+++ b/
Documentation/devicetree/bindings/spi/efm32-spi.txt
@@
-28,7
+28,6
@@
spi1: spi@0x4000c400 { /* USART1 */
clocks = <&cmu 20>;
cs-gpios = <&gpio 51 1>; // D3
energymicro,location = <1>;
- status = "ok";
ks8851@0 {
compatible = "ks8851";
@@
-36,6
+35,5
@@
spi1: spi@0x4000c400 { /* USART1 */
reg = <0>;
interrupt-parent = <&boardfpga>;
interrupts = <4>;
- status = "ok";
};
};