[PATCH v3 1/1] gpio: omap: dts: Move interrupt-controller from #interrupt-cells description

[PATCH v3 1/1] gpio: omap: dts: Move interrupt-controller from #interrupt-cells description

[Javier Martinez Canillas]

The binding documentation for the OMAP GPIO controller has the
"#interrupt-cells" property listed before "#interrupt-controller"
property but its description after.
This is confusing so we move "#interrupt-cells" after the
"interrupt-controller" property so is followed by its description.

While being there, change the properties order to be consistent with
Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
and Documentation/devicetree/bindings/gpio/gpio.txt.

According with these docs, the order of the properties for a gpio-omap
device node should be:

    gpio-controller;
    #gpio-cells = <2>;
    interrupt-controller;
    #interrupt-cells = <2>;

Reported-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Acked-by: Jon Hunter <jon-hunter@ti.com>
---

Changes since v1:
  - Change the properties order to be consistent with the rest of the
    DT bindings docs suggested by Jon Hunter.

Changes since v2:
  - Fix changelog that explained the opposite of what the patch was doing as
    suggested by Benoit Cousson.

 .../devicetree/bindings/gpio/gpio-omap.txt         |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/gpio/gpio-omap.txt b/Documentation/devicetree/bindings/gpio/gpio-omap.txt
index bff51a2..a56e3a5 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-omap.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-omap.txt
@@ -5,12 +5,12 @@ Required properties:
   - "ti,omap2-gpio" for OMAP2 controllers
   - "ti,omap3-gpio" for OMAP3 controllers
   - "ti,omap4-gpio" for OMAP4 controllers
+- gpio-controller : Marks the device node as a GPIO controller.
 - #gpio-cells : Should be two.
   - first cell is the pin number
   - second cell is used to specify optional parameters (unused)
-- gpio-controller : Marks the device node as a GPIO controller.
+- interrupt-controller: Mark the device node as an interrupt controller.
 - #interrupt-cells : Should be 2.
-- interrupt-controller: Mark the device node as an interrupt controller
   The first cell is the GPIO number.
   The second cell is used to specify flags:
     bits[3:0] trigger type and level flags:
@@ -29,8 +29,8 @@ Example:
 gpio4: gpio4 {
     compatible = "ti,omap4-gpio";
     ti,hwmods = "gpio4";
-    #gpio-cells = <2>;
     gpio-controller;
-    #interrupt-cells = <2>;
+    #gpio-cells = <2>;
     interrupt-controller;
+    #interrupt-cells = <2>;
 };
-- 
1.7.7.6

Re: [PATCH v3 1/1] gpio: omap: dts: Move interrupt-controller from #interrupt-cells description

[Javier Martinez Canillas]

On Fri, Mar 15, 2013 at 2:31 PM, Javier Martinez Canillas
<javier.martinez@collabora.co.uk> wrote:
> The binding documentation for the OMAP GPIO controller has the
> "#interrupt-cells" property listed before "#interrupt-controller"
> property but its description after.
> This is confusing so we move "#interrupt-cells" after the
> "interrupt-controller" property so is followed by its description.
>
> While being there, change the properties order to be consistent with
> Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
> and Documentation/devicetree/bindings/gpio/gpio.txt.
>
> According with these docs, the order of the properties for a gpio-omap
> device node should be:
>
>     gpio-controller;
>     #gpio-cells = <2>;
>     interrupt-controller;
>     #interrupt-cells = <2>;
>
> Reported-by: Stephen Warren <swarren@nvidia.com>
> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
> Acked-by: Jon Hunter <jon-hunter@ti.com>
> ---
>
> Changes since v1:
>   - Change the properties order to be consistent with the rest of the
>     DT bindings docs suggested by Jon Hunter.
>
> Changes since v2:
>   - Fix changelog that explained the opposite of what the patch was doing as
>     suggested by Benoit Cousson.
>
>  .../devicetree/bindings/gpio/gpio-omap.txt         |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/gpio/gpio-omap.txt b/Documentation/devicetree/bindings/gpio/gpio-omap.txt
> index bff51a2..a56e3a5 100644
> --- a/Documentation/devicetree/bindings/gpio/gpio-omap.txt
> +++ b/Documentation/devicetree/bindings/gpio/gpio-omap.txt
> @@ -5,12 +5,12 @@ Required properties:
>    - "ti,omap2-gpio" for OMAP2 controllers
>    - "ti,omap3-gpio" for OMAP3 controllers
>    - "ti,omap4-gpio" for OMAP4 controllers
> +- gpio-controller : Marks the device node as a GPIO controller.
>  - #gpio-cells : Should be two.
>    - first cell is the pin number
>    - second cell is used to specify optional parameters (unused)
> -- gpio-controller : Marks the device node as a GPIO controller.
> +- interrupt-controller: Mark the device node as an interrupt controller.
>  - #interrupt-cells : Should be 2.
> -- interrupt-controller: Mark the device node as an interrupt controller
>    The first cell is the GPIO number.
>    The second cell is used to specify flags:
>      bits[3:0] trigger type and level flags:
> @@ -29,8 +29,8 @@ Example:
>  gpio4: gpio4 {
>      compatible = "ti,omap4-gpio";
>      ti,hwmods = "gpio4";
> -    #gpio-cells = <2>;
>      gpio-controller;
> -    #interrupt-cells = <2>;
> +    #gpio-cells = <2>;
>      interrupt-controller;
> +    #interrupt-cells = <2>;
>  };
> --
> 1.7.7.6
>

Hello,

any comments on this patch?

Best regards,
Javier

Re: [PATCH v3 1/1] gpio: omap: dts: Move interrupt-controller from #interrupt-cells description

[Benoit Cousson]

Hi Javier,

On 03/26/2013 10:33 AM, Javier Martinez Canillas wrote:
> On Fri, Mar 15, 2013 at 2:31 PM, Javier Martinez Canillas
> <javier.martinez@collabora.co.uk> wrote:
>> The binding documentation for the OMAP GPIO controller has the
>> "#interrupt-cells" property listed before "#interrupt-controller"
>> property but its description after.
>> This is confusing so we move "#interrupt-cells" after the
>> "interrupt-controller" property so is followed by its description.
>>
>> While being there, change the properties order to be consistent with
>> Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
>> and Documentation/devicetree/bindings/gpio/gpio.txt.
>>
>> According with these docs, the order of the properties for a gpio-omap
>> device node should be:
>>
>>     gpio-controller;
>>     #gpio-cells = <2>;
>>     interrupt-controller;
>>     #interrupt-cells = <2>;
>>
>> Reported-by: Stephen Warren <swarren@nvidia.com>
>> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
>> Acked-by: Jon Hunter <jon-hunter@ti.com>
>> ---
>>
>> Changes since v1:
>>   - Change the properties order to be consistent with the rest of the
>>     DT bindings docs suggested by Jon Hunter.
>>
>> Changes since v2:
>>   - Fix changelog that explained the opposite of what the patch was doing as
>>     suggested by Benoit Cousson.
>>
>>  .../devicetree/bindings/gpio/gpio-omap.txt         |    8 ++++----
>>  1 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/gpio/gpio-omap.txt b/Documentation/devicetree/bindings/gpio/gpio-omap.txt
>> index bff51a2..a56e3a5 100644
>> --- a/Documentation/devicetree/bindings/gpio/gpio-omap.txt
>> +++ b/Documentation/devicetree/bindings/gpio/gpio-omap.txt
>> @@ -5,12 +5,12 @@ Required properties:
>>    - "ti,omap2-gpio" for OMAP2 controllers
>>    - "ti,omap3-gpio" for OMAP3 controllers
>>    - "ti,omap4-gpio" for OMAP4 controllers
>> +- gpio-controller : Marks the device node as a GPIO controller.
>>  - #gpio-cells : Should be two.
>>    - first cell is the pin number
>>    - second cell is used to specify optional parameters (unused)
>> -- gpio-controller : Marks the device node as a GPIO controller.
>> +- interrupt-controller: Mark the device node as an interrupt controller.
>>  - #interrupt-cells : Should be 2.
>> -- interrupt-controller: Mark the device node as an interrupt controller
>>    The first cell is the GPIO number.
>>    The second cell is used to specify flags:
>>      bits[3:0] trigger type and level flags:
>> @@ -29,8 +29,8 @@ Example:
>>  gpio4: gpio4 {
>>      compatible = "ti,omap4-gpio";
>>      ti,hwmods = "gpio4";
>> -    #gpio-cells = <2>;
>>      gpio-controller;
>> -    #interrupt-cells = <2>;
>> +    #gpio-cells = <2>;
>>      interrupt-controller;
>> +    #interrupt-cells = <2>;
>>  };
>> --
>> 1.7.7.6
>>
> 
> Hello,
> 
> any comments on this patch?

That's perfect. I've just applied it in my branch.

Thanks,
Benoit

Re: [PATCH v3 1/1] gpio: omap: dts: Move interrupt-controller from #interrupt-cells description

[Benoit Cousson]

On 03/26/2013 03:10 PM, Benoit Cousson wrote:
> Hi Javier,
> 
> On 03/26/2013 10:33 AM, Javier Martinez Canillas wrote:
>> On Fri, Mar 15, 2013 at 2:31 PM, Javier Martinez Canillas
>> <javier.martinez@collabora.co.uk> wrote:
>>> The binding documentation for the OMAP GPIO controller has the
>>> "#interrupt-cells" property listed before "#interrupt-controller"
>>> property but its description after.
>>> This is confusing so we move "#interrupt-cells" after the
>>> "interrupt-controller" property so is followed by its description.
>>>
>>> While being there, change the properties order to be consistent with
>>> Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
>>> and Documentation/devicetree/bindings/gpio/gpio.txt.
>>>
>>> According with these docs, the order of the properties for a gpio-omap
>>> device node should be:
>>>
>>>     gpio-controller;
>>>     #gpio-cells = <2>;
>>>     interrupt-controller;
>>>     #interrupt-cells = <2>;
>>>
>>> Reported-by: Stephen Warren <swarren@nvidia.com>
>>> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
>>> Acked-by: Jon Hunter <jon-hunter@ti.com>
>>> ---
>>>
>>> Changes since v1:
>>>   - Change the properties order to be consistent with the rest of the
>>>     DT bindings docs suggested by Jon Hunter.
>>>
>>> Changes since v2:
>>>   - Fix changelog that explained the opposite of what the patch was doing as
>>>     suggested by Benoit Cousson.
>>>
>>>  .../devicetree/bindings/gpio/gpio-omap.txt         |    8 ++++----
>>>  1 files changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/gpio/gpio-omap.txt b/Documentation/devicetree/bindings/gpio/gpio-omap.txt
>>> index bff51a2..a56e3a5 100644
>>> --- a/Documentation/devicetree/bindings/gpio/gpio-omap.txt
>>> +++ b/Documentation/devicetree/bindings/gpio/gpio-omap.txt
>>> @@ -5,12 +5,12 @@ Required properties:
>>>    - "ti,omap2-gpio" for OMAP2 controllers
>>>    - "ti,omap3-gpio" for OMAP3 controllers
>>>    - "ti,omap4-gpio" for OMAP4 controllers
>>> +- gpio-controller : Marks the device node as a GPIO controller.
>>>  - #gpio-cells : Should be two.
>>>    - first cell is the pin number
>>>    - second cell is used to specify optional parameters (unused)
>>> -- gpio-controller : Marks the device node as a GPIO controller.
>>> +- interrupt-controller: Mark the device node as an interrupt controller.
>>>  - #interrupt-cells : Should be 2.
>>> -- interrupt-controller: Mark the device node as an interrupt controller
>>>    The first cell is the GPIO number.
>>>    The second cell is used to specify flags:
>>>      bits[3:0] trigger type and level flags:
>>> @@ -29,8 +29,8 @@ Example:
>>>  gpio4: gpio4 {
>>>      compatible = "ti,omap4-gpio";
>>>      ti,hwmods = "gpio4";
>>> -    #gpio-cells = <2>;
>>>      gpio-controller;
>>> -    #interrupt-cells = <2>;
>>> +    #gpio-cells = <2>;
>>>      interrupt-controller;
>>> +    #interrupt-cells = <2>;
>>>  };
>>> --
>>> 1.7.7.6
>>>
>>
>> Hello,
>>
>> any comments on this patch?
> 
> That's perfect. I've just applied it in my branch.

OK, in fact it is almost perfect :-)

The patch modified the documentation and not the driver itself, so I modified the subject to reflect that accurately.

Documentation: dt: gpio-omap: Move interrupt-controller from #interrupt-cell

Regards,
Benoit

Re: [PATCH v3 1/1] gpio: omap: dts: Move interrupt-controller from #interrupt-cells description

[Javier Martinez Canillas]

On 03/26/2013 03:29 PM, Benoit Cousson wrote:
> On 03/26/2013 03:10 PM, Benoit Cousson wrote:
>> Hi Javier,
>> 
>> On 03/26/2013 10:33 AM, Javier Martinez Canillas wrote:
>>> On Fri, Mar 15, 2013 at 2:31 PM, Javier Martinez Canillas
>>> <javier.martinez@collabora.co.uk> wrote:
>>>> The binding documentation for the OMAP GPIO controller has the
>>>> "#interrupt-cells" property listed before "#interrupt-controller"
>>>> property but its description after.
>>>> This is confusing so we move "#interrupt-cells" after the
>>>> "interrupt-controller" property so is followed by its description.
>>>>
>>>> While being there, change the properties order to be consistent with
>>>> Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
>>>> and Documentation/devicetree/bindings/gpio/gpio.txt.
>>>>
>>>> According with these docs, the order of the properties for a gpio-omap
>>>> device node should be:
>>>>
>>>>     gpio-controller;
>>>>     #gpio-cells = <2>;
>>>>     interrupt-controller;
>>>>     #interrupt-cells = <2>;
>>>>
>>>> Reported-by: Stephen Warren <swarren@nvidia.com>
>>>> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
>>>> Acked-by: Jon Hunter <jon-hunter@ti.com>
>>>> ---
>>>>
>>>> Changes since v1:
>>>>   - Change the properties order to be consistent with the rest of the
>>>>     DT bindings docs suggested by Jon Hunter.
>>>>
>>>> Changes since v2:
>>>>   - Fix changelog that explained the opposite of what the patch was doing as
>>>>     suggested by Benoit Cousson.
>>>>
>>>>  .../devicetree/bindings/gpio/gpio-omap.txt         |    8 ++++----
>>>>  1 files changed, 4 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/gpio/gpio-omap.txt b/Documentation/devicetree/bindings/gpio/gpio-omap.txt
>>>> index bff51a2..a56e3a5 100644
>>>> --- a/Documentation/devicetree/bindings/gpio/gpio-omap.txt
>>>> +++ b/Documentation/devicetree/bindings/gpio/gpio-omap.txt
>>>> @@ -5,12 +5,12 @@ Required properties:
>>>>    - "ti,omap2-gpio" for OMAP2 controllers
>>>>    - "ti,omap3-gpio" for OMAP3 controllers
>>>>    - "ti,omap4-gpio" for OMAP4 controllers
>>>> +- gpio-controller : Marks the device node as a GPIO controller.
>>>>  - #gpio-cells : Should be two.
>>>>    - first cell is the pin number
>>>>    - second cell is used to specify optional parameters (unused)
>>>> -- gpio-controller : Marks the device node as a GPIO controller.
>>>> +- interrupt-controller: Mark the device node as an interrupt controller.
>>>>  - #interrupt-cells : Should be 2.
>>>> -- interrupt-controller: Mark the device node as an interrupt controller
>>>>    The first cell is the GPIO number.
>>>>    The second cell is used to specify flags:
>>>>      bits[3:0] trigger type and level flags:
>>>> @@ -29,8 +29,8 @@ Example:
>>>>  gpio4: gpio4 {
>>>>      compatible = "ti,omap4-gpio";
>>>>      ti,hwmods = "gpio4";
>>>> -    #gpio-cells = <2>;
>>>>      gpio-controller;
>>>> -    #interrupt-cells = <2>;
>>>> +    #gpio-cells = <2>;
>>>>      interrupt-controller;
>>>> +    #interrupt-cells = <2>;
>>>>  };
>>>> --
>>>> 1.7.7.6
>>>>
>>>
>>> Hello,
>>>
>>> any comments on this patch?
>> 
>> That's perfect. I've just applied it in my branch.
> 
> OK, in fact it is almost perfect :-)
> 
> The patch modified the documentation and not the driver itself, so I modified the subject to reflect that accurately.
> 
> Documentation: dt: gpio-omap: Move interrupt-controller from #interrupt-cell
>

Sorry about that, this pattern was not evident for me by looking the Git logs.
Now I know for future patches.

Thanks a lot for pointing this out!

> Regards,
> Benoit
> 
> 

Best regards,
Javier