ARM: dts: omap5: add minimal l4 bus layout with control module support

This patch creates the l4_cfg and l4_wkup interconnects for OMAP5, and
moves some of the generic peripherals under it. System control module
support is added to the device tree also, and the existing SCM related
functionality is moved under it.

Signed-off-by: Tero Kristo <t-kristo@ti.com>

diff --git a/Documentation/devicetree/bindings/arm/omap/ctrl.txt b/Documentation/devicetree/bindings/arm/omap/ctrl.txt
index 2675881..acb68ed 100644 (file)
--- a/Documentation/devicetree/bindings/arm/omap/ctrl.txt
+++ b/Documentation/devicetree/bindings/arm/omap/ctrl.txt
@@ -21,6 +21,8 @@ Required properties:
                "ti,omap3-scm"
                "ti,omap4-scm-core"
                "ti,omap4-scm-padconf-core"
+               "ti,omap5-scm-core"
+               "ti,omap5-scm-padconf-core"
 - reg:         Contains Control Module register address range
                (base address and length)
 

diff --git a/Documentation/devicetree/bindings/arm/omap/l4.txt b/Documentation/devicetree/bindings/arm/omap/l4.txt
index de18cfa..2fe4211 100644 (file)
--- a/Documentation/devicetree/bindings/arm/omap/l4.txt
+++ b/Documentation/devicetree/bindings/arm/omap/l4.txt
@@ -8,6 +8,8 @@ Required properties:
               Should be "ti,omap3-l4-core" for OMAP3 family l4 core bus
               Should be "ti,omap4-l4-cfg" for OMAP4 family l4 cfg bus
               Should be "ti,omap4-l4-wkup" for OMAP4 family l4 wkup bus
+              Should be "ti,omap5-l4-cfg" for OMAP5 family l4 cfg bus
+              Should be "ti,omap5-l4-wkup" for OMAP5 family l4 wkup bus
               Should be "ti,am3-l4-wkup" for AM33xx family l4 wkup bus
               Should be "ti,am4-l4-wkup" for AM43xx family l4 wkup bus
 - ranges : contains the IO map range for the bus

diff --cc arch/arm/boot/dts/omap5.dtsi
Simple merge