ARM: dts: Add missing properties for omap4 control modules

On omap4, we are missing several ti,hwmods properties and IO
ranges for system control modules. These are needed by the SoC
interconnect code.

Note that this will only show up as a bug with "doesn't have
mpu register target base" boot errors when the legacy platform
data is removed.

In order to add these, we need to move omap4_pmx_wkup to be a
child of omap4_padconf_wkup.

On omap4 there are separate modules for control module and
control module pads. For control module core, we have this
already configured except for the missing ti,hwmods and reg
entries.

Cc: Mark Rutland <mark.rutland@arm.com>
Acked-by: Rob Herring <robh+dt@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/Documentation/devicetree/bindings/arm/omap/ctrl.txt b/Documentation/devicetree/bindings/arm/omap/ctrl.txt
index 3a4e590..ce8dabf 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,omap4-scm-wkup"
+               "ti,omap4-scm-padconf-wkup"
                "ti,omap5-scm-core"
                "ti,omap5-scm-padconf-core"
                "ti,dra7-scm-core"

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 47bc419..16ec0bd 100644 (file)
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -174,6 +174,7 @@
                                #address-cells = <1>;
                                #size-cells = <1>;
                                ranges = <0 0x2000 0x1000>;
+                               ti,hwmods = "ctrl_module_core";
 
                                scm_conf: scm_conf@0 {
                                        compatible = "syscon";
@@ -186,9 +187,11 @@
                        omap4_padconf_core: scm@100000 {
                                compatible = "ti,omap4-scm-padconf-core",
                                             "simple-bus";
+                               reg = <0x100000 0x1000>;
                                #address-cells = <1>;
                                #size-cells = <1>;
                                ranges = <0 0x100000 0x1000>;
+                               ti,hwmods = "ctrl_module_pad_core";
 
                                omap4_pmx_core: pinmux@40 {
                                        compatible = "ti,omap4-padconf",
@@ -263,17 +266,33 @@
                                        };
                                };
 
-                               omap4_pmx_wkup: pinmux@1e040 {
-                                       compatible = "ti,omap4-padconf",
-                                                    "pinctrl-single";
-                                       reg = <0x1e040 0x0038>;
+                               omap4_scm_wkup: scm@c000 {
+                                       compatible = "ti,omap4-scm-wkup";
+                                       reg = <0xc000 0x1000>;
+                                       ti,hwmods = "ctrl_module_wkup";
+                               };
+
+                               omap4_padconf_wkup: padconf@1e000 {
+                                       compatible = "ti,omap4-scm-padconf-wkup",
+                                                    "simple-bus";
+                                       reg = <0x1e000 0x1000>;
                                        #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       #pinctrl-cells = <1>;
-                                       #interrupt-cells = <1>;
-                                       interrupt-controller;
-                                       pinctrl-single,register-width = <16>;
-                                       pinctrl-single,function-mask = <0x7fff>;
+                                       #size-cells = <1>;
+                                       ranges = <0 0x1e000 0x1000>;
+                                       ti,hwmods = "ctrl_module_pad_wkup";
+
+                                       omap4_pmx_wkup: pinmux@40 {
+                                               compatible = "ti,omap4-padconf",
+                                                            "pinctrl-single";
+                                               reg = <0x40 0x0038>;
+                                               #address-cells = <1>;
+                                               #size-cells = <0>;
+                                               #pinctrl-cells = <1>;
+                                               #interrupt-cells = <1>;
+                                               interrupt-controller;
+                                               pinctrl-single,register-width = <16>;
+                                               pinctrl-single,function-mask = <0x7fff>;
+                                       };
                                };
                        };
                };