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 'pci-v5.1-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
arm
/
amlogic.txt
diff --git
a/Documentation/devicetree/bindings/arm/amlogic.txt
b/Documentation/devicetree/bindings/arm/amlogic.txt
index 8dbc259081e405d100cc219fe459e11bc5325acf..7f40cb5f490bd741184103ee3c2683d8cd3346c4 100644
(file)
--- a/
Documentation/devicetree/bindings/arm/amlogic.txt
+++ b/
Documentation/devicetree/bindings/arm/amlogic.txt
@@
-109,6
+109,7
@@
Board compatible values (alphabetically, grouped by SoC):
- "amlogic,s400" (Meson axg a113d)
- "amlogic,u200" (Meson g12a s905d2)
+ - "amediatech,x96-max" (Meson g12a s905x2)
Amlogic Meson Firmware registers Interface
------------------------------------------