summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-11-18 16:42:44 -0800
committerOlof Johansson <olof@lixom.net>2016-11-18 16:42:44 -0800
commita9fa1f7c18e22223026f151f563f9770d6923a75 (patch)
treea5e5a8175a67e96f83ba4e3dc03bc20c8aef0b84 /Documentation/devicetree/bindings
parente1cb1c7835e2fc4c025950dc7b98ac22b24a78e9 (diff)
parent2bb6375f5c03cc5bf510402b646c1a23046b3f12 (diff)
downloadblackbird-op-linux-a9fa1f7c18e22223026f151f563f9770d6923a75.tar.gz
blackbird-op-linux-a9fa1f7c18e22223026f151f563f9770d6923a75.zip
Merge tag 'omap-for-v4.10/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
SoC changes for omaps for v4.10 merge window: - Add hwmod interconnect target wrapper module data for crypto accelerators for am3xxx, am43xx and dra7 - Add support for dra71x family of SoCs - PM fixes for omap4/5 needed for omap5 cpuidle * tag 'omap-for-v4.10/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: DRA7: hwmod: Do not register RTC on DRA71 ARM: OMAP2+: board-generic: add support for DRA71x family ARM: AMx3xx: hwmod: Add data for RNG ARM: AM43xx: hwmod: Add data for DES ARM: OMAP: DRA7xx: Make L4SEC clock domain SWSUP only ARM: DRA7: hwmod: Add data for RNG IP ARM: DRA7: hwmod: Add data for SHA IP ARM: DRA7: hwmod: Add data for AES IP ARM: DRA7: hwmod: Add data for DES IP ARM: OMAP5: Add basic cpuidle MPU CSWR support ARM: OMAP4+: Fix bad fallthrough for cpuidle ARM: OMAP5: Fix mpuss_early_init ARM: OMAP5: Fix build for PM code Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings')
-rw-r--r--Documentation/devicetree/bindings/arm/omap/omap.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt
index f53e2ee65e35..454b1bec7542 100644
--- a/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@ -86,6 +86,9 @@ SoCs:
- DRA722
compatible = "ti,dra722", "ti,dra72", "ti,dra7"
+- DRA718
+ compatible = "ti,dra718", "ti,dra722", "ti,dra72", "ti,dra7"
+
- AM5728
compatible = "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"
@@ -181,6 +184,9 @@ Boards:
- DRA722 EVM: Software Development Board for DRA722
compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7"
+- DRA718 EVM: Software Development Board for DRA718
+ compatible = "ti,dra718-evm", "ti,dra718", "ti,dra722", "ti,dra72", "ti,dra7"
+
- DM3730 Logic PD Torpedo + Wireless: Commercial System on Module with WiFi and Bluetooth
compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3630", "ti,omap3"
OpenPOWER on IntegriCloud