projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nds32-for-linus-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
Documentation
/
devicetree
/
bindings
/
mips
/
brcm
/
soc.txt
diff --git
a/Documentation/devicetree/bindings/mips/brcm/soc.txt
b/Documentation/devicetree/bindings/mips/brcm/soc.txt
index
356c297
..
3a66d3c
100644
(file)
--- a/
Documentation/devicetree/bindings/mips/brcm/soc.txt
+++ b/
Documentation/devicetree/bindings/mips/brcm/soc.txt
@@
-152,7
+152,7
@@
Required properties:
- compatible : should contain one of:
"brcm,bcm7425-timers"
"brcm,bcm7429-timers"
- "brcm,bcm7435-timers and
+ "brcm,bcm7435-timers
"
and
"brcm,brcmstb-timers"
- reg : the timers register range
- interrupts : the interrupt line for this timer block