3 files changed, 79 insertions, 18 deletions

diff --git a/Documentation/devicetree/bindings/arm/arch_timer.txt b/Documentation/devicetree/bindings/arm/arch_timer.txt
index 06fc7602593a..37b2cafa4e52 100644
--- a/Documentation/devicetree/bindings/arm/arch_timer.txt
+++ b/Documentation/devicetree/bindings/arm/arch_timer.txt
@@ -19,6 +19,9 @@ to deliver its interrupts via SPIs.
 
 - clock-frequency : The frequency of the main counter, in Hz. Optional.
 
+- always-on : a boolean property. If present, the timer is powered through an
+  always-on power domain, therefore it never loses context.
+
 Example:
 
         timer {
diff --git a/Documentation/devicetree/bindings/arm/vexpress-sysreg.txt b/Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
index 5580e9c4bd85..00318d083c9e 100644
--- a/Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
+++ b/Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
@@ -8,6 +8,8 @@ interrupt generation, MMC and NOR Flash control etc.
 Required node properties:
 - compatible value : = "arm,vexpress,sysreg";
 - reg : physical base address and the size of the registers window
+
+Deprecated properties, replaced by GPIO subnodes (see below):
 - gpio-controller : specifies that the node is a GPIO controller
 - #gpio-cells : size of the GPIO specifier, should be 2:
   - first cell is the pseudo-GPIO line number:
@@ -16,35 +18,86 @@ Required node properties:
     2 - NOR FLASH WPn
   - second cell can take standard GPIO flags (currently ignored).
 
+Control registers providing pseudo-GPIO lines must be represented
+by subnodes, each of them requiring the following properties:
+- compatible value : one of
+                        "arm,vexpress-sysreg,sys_led"
+                        "arm,vexpress-sysreg,sys_mci"
+                        "arm,vexpress-sysreg,sys_flash"
+- gpio-controller : makes the node a GPIO controller
+- #gpio-cells : size of the GPIO specifier, must be 2:
+  - first cell is the function number:
+    - for sys_led : 0..7 = LED 0..7
+    - for sys_mci : 0 = MMC CARDIN, 1 = MMC WPROT
+    - for sys_flash : 0 = NOR FLASH WPn
+  - second cell can take standard GPIO flags (currently ignored).
+
 Example:
         v2m_sysreg: sysreg@10000000 {
                 compatible = "arm,vexpress-sysreg";
                 reg = <0x10000000 0x1000>;
-                gpio-controller;
-                #gpio-cells = <2>;
+
+                v2m_led_gpios: sys_led@08 {
+                        compatible = "arm,vexpress-sysreg,sys_led";
+                        gpio-controller;
+                        #gpio-cells = <2>;
+                };
+
+                v2m_mmc_gpios: sys_mci@48 {
+                        compatible = "arm,vexpress-sysreg,sys_mci";
+                        gpio-controller;
+                        #gpio-cells = <2>;
+                };
+
+                v2m_flash_gpios: sys_flash@4c {
+                        compatible = "arm,vexpress-sysreg,sys_flash";
+                        gpio-controller;
+                        #gpio-cells = <2>;
+                };
         };
 
 This block also can also act a bridge to the platform's configuration
 bus via "system control" interface, addressing devices with site number,
 position in the board stack, config controller, function and device
-numbers - see motherboard's TRM for more details.
-
-The node describing a config device must refer to the sysreg node via
-"arm,vexpress,config-bridge" phandle (can be also defined in the node's
-parent) and relies on the board topology properties - see main vexpress
-node documentation for more details. It must also define the following
-property:
-- arm,vexpress-sysreg,func : must contain two cells:
-  - first cell defines function number (eg. 1 for clock generator,
-    2 for voltage regulators etc.)
-  - device number (eg. osc 0, osc 1 etc.)
+numbers - see motherboard's TRM for more details. All configuration
+controller accessible via this interface must reference the sysreg
+node via "arm,vexpress,config-bridge" phandle and define appropriate
+topology properties - see main vexpress node documentation for more
+details. Each child of such node describes one function and must
+define the following properties:
+- compatible value : must be one of (corresponding to the TRM):
+        "arm,vexpress-amp"
+        "arm,vexpress-dvimode"
+        "arm,vexpress-energy"
+        "arm,vexpress-muxfpga"
+        "arm,vexpress-osc"
+        "arm,vexpress-power"
+        "arm,vexpress-reboot"
+        "arm,vexpress-reset"
+        "arm,vexpress-scc"
+        "arm,vexpress-shutdown"
+        "arm,vexpress-temp"
+        "arm,vexpress-volt"
+- arm,vexpress-sysreg,func : must contain a set of two cells long groups:
+  - first cell of each group defines the function number
+    (eg. 1 for clock generator, 2 for voltage regulators etc.)
+  - second cell of each group defines device number (eg. osc 0,
+    osc 1 etc.)
+  - some functions (eg. energy meter, with its 64 bit long counter)
+    are using more than one function/device number pair
 
 Example:
         mcc {
+                compatible = "arm,vexpress,config-bus";
                 arm,vexpress,config-bridge = <&v2m_sysreg>;
 
                 osc@0 {
                         compatible = "arm,vexpress-osc";
                         arm,vexpress-sysreg,func = <1 0>;
                 };
+
+                energy@0 {
+                        compatible = "arm,vexpress-energy";
+                        arm,vexpress-sysreg,func = <13 0>, <13 1>;
+                };
         };
diff --git a/Documentation/devicetree/bindings/arm/vexpress.txt b/Documentation/devicetree/bindings/arm/vexpress.txt
index ae49161e478a..39844cd0bcce 100644
--- a/Documentation/devicetree/bindings/arm/vexpress.txt
+++ b/Documentation/devicetree/bindings/arm/vexpress.txt
@@ -80,12 +80,17 @@ but also control clock generators, voltage regulators, gather
 environmental data like temperature, power consumption etc. Even
 the video output switch (FPGA) is controlled that way.
 
-Nodes describing devices controlled by this infrastructure should
-point at the bridge device node:
+The controllers are not mapped into normal memory address space
+and must be accessed through bridges - other devices capable
+of generating transactions on the configuration bus.
+
+The nodes describing configuration controllers must define
+the following properties:
+- compatible value:
+        compatible = "arm,vexpress,config-bus";
 - bridge phandle:
         arm,vexpress,config-bridge = <phandle>;
-This property can be also defined in a parent node (eg. for a DCC)
-and is effective for all children.
+and children describing available functions.
 
 
 Platform topology
@@ -197,7 +202,7 @@ Example of a VE tile description (simplified)
         };
 
         dcc {
-                compatible = "simple-bus";
+                compatible = "arm,vexpress,config-bus";
                 arm,vexpress,config-bridge = <&v2m_sysreg>;
 
                 osc@0 {