diff --git a/[refs] b/[refs] index 4abd23ad069a..a2cec5a6053d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e969a401a0126806cc2a358800b5b52d6c0a246 +refs/heads/master: 790b520e3accec16f3d93937ef6fb91d1fd30cf0 diff --git a/trunk/Documentation/devicetree/bindings/gpio/gpio-adnp.txt b/trunk/Documentation/devicetree/bindings/gpio/gpio-adnp.txt index 5a09a216fe65..af66b2724837 100644 --- a/trunk/Documentation/devicetree/bindings/gpio/gpio-adnp.txt +++ b/trunk/Documentation/devicetree/bindings/gpio/gpio-adnp.txt @@ -11,6 +11,10 @@ Required properties: - gpio-controller: Marks the device as a GPIO controller - nr-gpios: The number of pins supported by the controller. +The GPIO expander can optionally be used as an interrupt controller, in +which case it uses the default two cell specifier as described in +Documentation/devicetree/bindings/interrupt-controller/interrupts.txt. + Example: gpioext: gpio-controller@41 {