[PATCH linux dev-4.7 01/14] gpio: aspeed: dt: Reset bindings to mainline

[Andrew Jeffery]

Signed-off-by: Andrew Jeffery <andrew at aj.id.au>
---
 .../devicetree/bindings/gpio/gpio-aspeed.txt         | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/Documentation/devicetree/bindings/gpio/gpio-aspeed.txt b/Documentation/devicetree/bindings/gpio/gpio-aspeed.txt
index 1954b288cd49..393bb2ed8a77 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-aspeed.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-aspeed.txt
@@ -2,28 +2,22 @@ Aspeed GPIO controller Device Tree Bindings
 -------------------------------------------
 
 Required properties:
+- compatible		: Either "aspeed,ast2400-gpio" or "aspeed,ast2500-gpio"
+
 - #gpio-cells 		: Should be two
 			  - First cell is the GPIO line number
 			  - Second cell is used to specify optional
 			    parameters (unused)
 
-- compatible		: Either "aspeed,ast2400-gpio" or "aspeed,ast2500-gpio"
-
 - reg			: Address and length of the register set for the device
 - gpio-controller	: Marks the device node as a GPIO controller.
 - interrupts		: Interrupt specifier (see interrupt bindings for
 			  details)
+- interrupt-controller	: Mark the GPIO controller as an interrupt-controller
 
 Optional properties:
-- interrupt-controller	: Marks the device node as an interrupt controller.
-- interrupt-parent	: The parent interrupt controller, optional if inherited
-- #interrupt-cells 	: Should be 2.  The first cell is the GPIO number.
-			  The second cell bits[3:0] is used to specify trigger
-			  type and level flags:
-			      1 = low-to-high edge triggered.
-			      2 = high-to-low edge triggered.
-			      4 = active high level-sensitive.
-			      8 = active low level-sensitive.
+
+- interrupt-parent     : The parent interrupt controller, optional if inherited
 
 The gpio and interrupt properties are further described in their respective
 bindings documentation:
@@ -34,9 +28,9 @@ bindings documentation:
   Example:
 	gpio at 1e780000 {
 		#gpio-cells = <2>;
-		compatible = "aspeed,ast2400-gpio"
+		compatible = "aspeed,ast2400-gpio";
 		gpio-controller;
-		interrupt-parent = <&intc>;
 		interrupts = <20>;
 		reg = <0x1e780000 0x1000>;
+		interrupt-controller;
 	};
-- 
2.9.3