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

[PATCH v2 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 description
for the "#interrupt-cells" property after the "interrupt-controller".
This is confusing so is better to move the "interrupt-controller" after
"#interrupt-cells" 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.

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.

 .../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 v2 1/1] gpio: omap: dts: Move interrupt-controller from #interrupt-cells description

[Javier Martinez Canillas]

On Mon, Mar 4, 2013 at 9:56 PM, Javier Martinez Canillas
<javier.martinez@collabora.co.uk> wrote:
> The binding documentation for the OMAP GPIO controller has the description
> for the "#interrupt-cells" property after the "interrupt-controller".
> This is confusing so is better to move the "interrupt-controller" after
> "#interrupt-cells" 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.
>
> 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.
>
>  .../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?

I know is just a trivial documentation fix but I think it can be quite
helpful for people referring to gpio-omap binding.

Best regards,
Javier

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

[Benoit Cousson]

Hi Javier,

On 03/15/2013 01:18 PM, Javier Martinez Canillas wrote:
> On Mon, Mar 4, 2013 at 9:56 PM, Javier Martinez Canillas
> <javier.martinez@collabora.co.uk> wrote:
>> The binding documentation for the OMAP GPIO controller has the description
>> for the "#interrupt-cells" property after the "interrupt-controller".
>> This is confusing so is better to move the "interrupt-controller" after
>> "#interrupt-cells" description.

Mmm, your are doing the opposite  :-)

I guess what we do want is that:

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

So we move "#interrupt-cells" after the "interrupt-controller" 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.
>>
>> 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.
>>
>>  .../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?
> 
> I know is just a trivial documentation fix but I think it can be quite
> helpful for people referring to gpio-omap binding.

I do agree. The patch is good, but the changelog is confusing.

Regards,
Benoit

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

[Javier Martinez Canillas]

On Fri, Mar 15, 2013 at 1:56 PM, Benoit Cousson <b-cousson-l0cyMroinI0@public.gmane.org> wrote:
> Hi Javier,
>
> On 03/15/2013 01:18 PM, Javier Martinez Canillas wrote:
>> On Mon, Mar 4, 2013 at 9:56 PM, Javier Martinez Canillas
>> <javier.martinez-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org> wrote:
>>> The binding documentation for the OMAP GPIO controller has the description
>>> for the "#interrupt-cells" property after the "interrupt-controller".
>>> This is confusing so is better to move the "interrupt-controller" after
>>> "#interrupt-cells" description.
>
> Mmm, your are doing the opposite  :-)
>
> I guess what we do want is that:
>
>     gpio-controller;
>     #gpio-cells = <2>;
>     interrupt-controller;
>     #interrupt-cells = <2>;
>
> So we move "#interrupt-cells" after the "interrupt-controller" description.
>

Indeed!

I got confused I guess...

I'll send a v3 patch fixing the changelog

>>> 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.
>>>
>>> Reported-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>>> Signed-off-by: Javier Martinez Canillas <javier.martinez-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org>
>>> Acked-by: Jon Hunter <jon-hunter-l0cyMroinI0@public.gmane.org>
>>> ---
>>>
>>> Changes since v1:
>>>   - Change the properties order to be consistent with the rest of the
>>>     DT bindings docs suggested by Jon Hunter.
>>>
>>>  .../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?
>>
>> I know is just a trivial documentation fix but I think it can be quite
>> helpful for people referring to gpio-omap binding.
>
> I do agree. The patch is good, but the changelog is confusing.
>
> Regards,
> Benoit
>

Thanks a lot for your feedback and best regards,
Javier