diff mbox

ARM: DT: Exynos: fix number of interrupt-cells in mct node

Message ID 1371220886-11616-1-git-send-email-chander.kashyap@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Chander Kashyap June 14, 2013, 2:41 p.m. UTC
Two cells were used to specify interrupts in mct node, while second cell
always remains unused. Hence use only one cell.
Suggested by Tomasz Figa.

Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
---
 arch/arm/boot/dts/exynos4210.dtsi |   19 +++++++++----------
 arch/arm/boot/dts/exynos4212.dtsi |   19 +++++++++----------
 arch/arm/boot/dts/exynos4412.dtsi |   23 +++++++++++------------
 arch/arm/boot/dts/exynos5250.dtsi |   19 +++++++++----------
 4 files changed, 38 insertions(+), 42 deletions(-)

Comments

Chander Kashyap July 23, 2013, 9:47 a.m. UTC | #1
ping.

On 14 June 2013 20:11, Chander Kashyap <chander.kashyap@linaro.org> wrote:
> Two cells were used to specify interrupts in mct node, while second cell
> always remains unused. Hence use only one cell.
> Suggested by Tomasz Figa.
>
> Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
> ---
>  arch/arm/boot/dts/exynos4210.dtsi |   19 +++++++++----------
>  arch/arm/boot/dts/exynos4212.dtsi |   19 +++++++++----------
>  arch/arm/boot/dts/exynos4412.dtsi |   23 +++++++++++------------
>  arch/arm/boot/dts/exynos5250.dtsi |   19 +++++++++----------
>  4 files changed, 38 insertions(+), 42 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
> index 54710de..ad50010 100644
> --- a/arch/arm/boot/dts/exynos4210.dtsi
> +++ b/arch/arm/boot/dts/exynos4210.dtsi
> @@ -52,23 +52,22 @@
>                 compatible = "samsung,exynos4210-mct";
>                 reg = <0x10050000 0x800>;
>                 interrupt-controller;
> -               #interrups-cells = <2>;
> +               #interrups-cells = <1>;
>                 interrupt-parent = <&mct_map>;
> -               interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
> -                            <4 0>, <5 0>;
> +               interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
>                 clocks = <&clock 3>, <&clock 344>;
>                 clock-names = "fin_pll", "mct";
>
>                 mct_map: mct-map {
> -                       #interrupt-cells = <2>;
> +                       #interrupt-cells = <1>;
>                         #address-cells = <0>;
>                         #size-cells = <0>;
> -                       interrupt-map = <0x0 0 &gic 0 57 0>,
> -                                       <0x1 0 &gic 0 69 0>,
> -                                       <0x2 0 &combiner 12 6>,
> -                                       <0x3 0 &combiner 12 7>,
> -                                       <0x4 0 &gic 0 42 0>,
> -                                       <0x5 0 &gic 0 48 0>;
> +                       interrupt-map = <0 &gic 0 57 0>,
> +                                       <1 &gic 0 69 0>,
> +                                       <2 &combiner 12 6>,
> +                                       <3 &combiner 12 7>,
> +                                       <4 &gic 0 42 0>,
> +                                       <5 &gic 0 48 0>;
>                 };
>         };
>
> diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi
> index c0f60f4..ba9ada1 100644
> --- a/arch/arm/boot/dts/exynos4212.dtsi
> +++ b/arch/arm/boot/dts/exynos4212.dtsi
> @@ -39,21 +39,20 @@
>                 compatible = "samsung,exynos4412-mct";
>                 reg = <0x10050000 0x800>;
>                 interrupt-controller;
> -               #interrups-cells = <2>;
> +               #interrups-cells = <1>;
>                 interrupt-parent = <&mct_map>;
> -               interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
> -                            <4 0>, <5 0>;
> +               interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
>
>                 mct_map: mct-map {
> -                       #interrupt-cells = <2>;
> +                       #interrupt-cells = <>;
>                         #address-cells = <0>;
>                         #size-cells = <0>;
> -                       interrupt-map = <0x0 0 &gic 0 57 0>,
> -                                       <0x1 0 &combiner 12 5>,
> -                                       <0x2 0 &combiner 12 6>,
> -                                       <0x3 0 &combiner 12 7>,
> -                                       <0x4 0 &gic 1 12 0>,
> -                                       <0x5 0 &gic 1 12 0>;
> +                       interrupt-map = <0 &gic 0 57 0>,
> +                                       <1 &combiner 12 5>,
> +                                       <2 &combiner 12 6>,
> +                                       <3 &combiner 12 7>,
> +                                       <4 &gic 1 12 0>,
> +                                       <5 &gic 1 12 0>;
>                 };
>         };
>  };
> diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
> index 270b389..a680de7 100644
> --- a/arch/arm/boot/dts/exynos4412.dtsi
> +++ b/arch/arm/boot/dts/exynos4412.dtsi
> @@ -39,25 +39,24 @@
>                 compatible = "samsung,exynos4412-mct";
>                 reg = <0x10050000 0x800>;
>                 interrupt-controller;
> -               #interrups-cells = <2>;
> +               #interrups-cells = <1>;
>                 interrupt-parent = <&mct_map>;
> -               interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
> -                            <4 0>, <5 0>, <6 0>, <7 0>;
> +               interrupts = <0>, <1>, <2>, <3>, <4>, <5>, <6>, <7>;
>                 clocks = <&clock 3>, <&clock 344>;
>                 clock-names = "fin_pll", "mct";
>
>                 mct_map: mct-map {
> -                       #interrupt-cells = <2>;
> +                       #interrupt-cells = <1>;
>                         #address-cells = <0>;
>                         #size-cells = <0>;
> -                       interrupt-map = <0x0 0 &gic 0 57 0>,
> -                                       <0x1 0 &combiner 12 5>,
> -                                       <0x2 0 &combiner 12 6>,
> -                                       <0x3 0 &combiner 12 7>,
> -                                       <0x4 0 &gic 1 12 0>,
> -                                       <0x5 0 &gic 1 12 0>,
> -                                       <0x6 0 &gic 1 12 0>,
> -                                       <0x7 0 &gic 1 12 0>;
> +                       interrupt-map = <0 &gic 0 57 0>,
> +                                       <1 &combiner 12 5>,
> +                                       <2 &combiner 12 6>,
> +                                       <3 &combiner 12 7>,
> +                                       <4 &gic 1 12 0>,
> +                                       <5 &gic 1 12 0>,
> +                                       <6 &gic 1 12 0>,
> +                                       <7 &gic 1 12 0>;
>                 };
>         };
>
> diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
> index a7cf3f5..4e633ef 100644
> --- a/arch/arm/boot/dts/exynos5250.dtsi
> +++ b/arch/arm/boot/dts/exynos5250.dtsi
> @@ -94,23 +94,22 @@
>                 compatible = "samsung,exynos4210-mct";
>                 reg = <0x101C0000 0x800>;
>                 interrupt-controller;
> -               #interrups-cells = <2>;
> +               #interrups-cells = <1>;
>                 interrupt-parent = <&mct_map>;
> -               interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
> -                            <4 0>, <5 0>;
> +               interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
>                 clocks = <&clock 1>, <&clock 335>;
>                 clock-names = "fin_pll", "mct";
>
>                 mct_map: mct-map {
> -                       #interrupt-cells = <2>;
> +                       #interrupt-cells = <1>;
>                         #address-cells = <0>;
>                         #size-cells = <0>;
> -                       interrupt-map = <0x0 0 &combiner 23 3>,
> -                                       <0x1 0 &combiner 23 4>,
> -                                       <0x2 0 &combiner 25 2>,
> -                                       <0x3 0 &combiner 25 3>,
> -                                       <0x4 0 &gic 0 120 0>,
> -                                       <0x5 0 &gic 0 121 0>;
> +                       interrupt-map = <0 &combiner 23 3>,
> +                                       <1 &combiner 23 4>,
> +                                       <2 &combiner 25 2>,
> +                                       <3 &combiner 25 3>,
> +                                       <4 &gic 0 120 0>,
> +                                       <5 &gic 0 121 0>;
>                 };
>         };
>
> --
> 1.7.9.5
>
Chander Kashyap Aug. 12, 2013, 6:23 a.m. UTC | #2
ping

On 23 July 2013 15:17, Chander Kashyap <chander.kashyap@linaro.org> wrote:
> ping.
>
> On 14 June 2013 20:11, Chander Kashyap <chander.kashyap@linaro.org> wrote:
>> Two cells were used to specify interrupts in mct node, while second cell
>> always remains unused. Hence use only one cell.
>> Suggested by Tomasz Figa.
>>
>> Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
>> ---
>>  arch/arm/boot/dts/exynos4210.dtsi |   19 +++++++++----------
>>  arch/arm/boot/dts/exynos4212.dtsi |   19 +++++++++----------
>>  arch/arm/boot/dts/exynos4412.dtsi |   23 +++++++++++------------
>>  arch/arm/boot/dts/exynos5250.dtsi |   19 +++++++++----------
>>  4 files changed, 38 insertions(+), 42 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
>> index 54710de..ad50010 100644
>> --- a/arch/arm/boot/dts/exynos4210.dtsi
>> +++ b/arch/arm/boot/dts/exynos4210.dtsi
>> @@ -52,23 +52,22 @@
>>                 compatible = "samsung,exynos4210-mct";
>>                 reg = <0x10050000 0x800>;
>>                 interrupt-controller;
>> -               #interrups-cells = <2>;
>> +               #interrups-cells = <1>;
>>                 interrupt-parent = <&mct_map>;
>> -               interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
>> -                            <4 0>, <5 0>;
>> +               interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
>>                 clocks = <&clock 3>, <&clock 344>;
>>                 clock-names = "fin_pll", "mct";
>>
>>                 mct_map: mct-map {
>> -                       #interrupt-cells = <2>;
>> +                       #interrupt-cells = <1>;
>>                         #address-cells = <0>;
>>                         #size-cells = <0>;
>> -                       interrupt-map = <0x0 0 &gic 0 57 0>,
>> -                                       <0x1 0 &gic 0 69 0>,
>> -                                       <0x2 0 &combiner 12 6>,
>> -                                       <0x3 0 &combiner 12 7>,
>> -                                       <0x4 0 &gic 0 42 0>,
>> -                                       <0x5 0 &gic 0 48 0>;
>> +                       interrupt-map = <0 &gic 0 57 0>,
>> +                                       <1 &gic 0 69 0>,
>> +                                       <2 &combiner 12 6>,
>> +                                       <3 &combiner 12 7>,
>> +                                       <4 &gic 0 42 0>,
>> +                                       <5 &gic 0 48 0>;
>>                 };
>>         };
>>
>> diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi
>> index c0f60f4..ba9ada1 100644
>> --- a/arch/arm/boot/dts/exynos4212.dtsi
>> +++ b/arch/arm/boot/dts/exynos4212.dtsi
>> @@ -39,21 +39,20 @@
>>                 compatible = "samsung,exynos4412-mct";
>>                 reg = <0x10050000 0x800>;
>>                 interrupt-controller;
>> -               #interrups-cells = <2>;
>> +               #interrups-cells = <1>;
>>                 interrupt-parent = <&mct_map>;
>> -               interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
>> -                            <4 0>, <5 0>;
>> +               interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
>>
>>                 mct_map: mct-map {
>> -                       #interrupt-cells = <2>;
>> +                       #interrupt-cells = <>;
>>                         #address-cells = <0>;
>>                         #size-cells = <0>;
>> -                       interrupt-map = <0x0 0 &gic 0 57 0>,
>> -                                       <0x1 0 &combiner 12 5>,
>> -                                       <0x2 0 &combiner 12 6>,
>> -                                       <0x3 0 &combiner 12 7>,
>> -                                       <0x4 0 &gic 1 12 0>,
>> -                                       <0x5 0 &gic 1 12 0>;
>> +                       interrupt-map = <0 &gic 0 57 0>,
>> +                                       <1 &combiner 12 5>,
>> +                                       <2 &combiner 12 6>,
>> +                                       <3 &combiner 12 7>,
>> +                                       <4 &gic 1 12 0>,
>> +                                       <5 &gic 1 12 0>;
>>                 };
>>         };
>>  };
>> diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
>> index 270b389..a680de7 100644
>> --- a/arch/arm/boot/dts/exynos4412.dtsi
>> +++ b/arch/arm/boot/dts/exynos4412.dtsi
>> @@ -39,25 +39,24 @@
>>                 compatible = "samsung,exynos4412-mct";
>>                 reg = <0x10050000 0x800>;
>>                 interrupt-controller;
>> -               #interrups-cells = <2>;
>> +               #interrups-cells = <1>;
>>                 interrupt-parent = <&mct_map>;
>> -               interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
>> -                            <4 0>, <5 0>, <6 0>, <7 0>;
>> +               interrupts = <0>, <1>, <2>, <3>, <4>, <5>, <6>, <7>;
>>                 clocks = <&clock 3>, <&clock 344>;
>>                 clock-names = "fin_pll", "mct";
>>
>>                 mct_map: mct-map {
>> -                       #interrupt-cells = <2>;
>> +                       #interrupt-cells = <1>;
>>                         #address-cells = <0>;
>>                         #size-cells = <0>;
>> -                       interrupt-map = <0x0 0 &gic 0 57 0>,
>> -                                       <0x1 0 &combiner 12 5>,
>> -                                       <0x2 0 &combiner 12 6>,
>> -                                       <0x3 0 &combiner 12 7>,
>> -                                       <0x4 0 &gic 1 12 0>,
>> -                                       <0x5 0 &gic 1 12 0>,
>> -                                       <0x6 0 &gic 1 12 0>,
>> -                                       <0x7 0 &gic 1 12 0>;
>> +                       interrupt-map = <0 &gic 0 57 0>,
>> +                                       <1 &combiner 12 5>,
>> +                                       <2 &combiner 12 6>,
>> +                                       <3 &combiner 12 7>,
>> +                                       <4 &gic 1 12 0>,
>> +                                       <5 &gic 1 12 0>,
>> +                                       <6 &gic 1 12 0>,
>> +                                       <7 &gic 1 12 0>;
>>                 };
>>         };
>>
>> diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
>> index a7cf3f5..4e633ef 100644
>> --- a/arch/arm/boot/dts/exynos5250.dtsi
>> +++ b/arch/arm/boot/dts/exynos5250.dtsi
>> @@ -94,23 +94,22 @@
>>                 compatible = "samsung,exynos4210-mct";
>>                 reg = <0x101C0000 0x800>;
>>                 interrupt-controller;
>> -               #interrups-cells = <2>;
>> +               #interrups-cells = <1>;
>>                 interrupt-parent = <&mct_map>;
>> -               interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
>> -                            <4 0>, <5 0>;
>> +               interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
>>                 clocks = <&clock 1>, <&clock 335>;
>>                 clock-names = "fin_pll", "mct";
>>
>>                 mct_map: mct-map {
>> -                       #interrupt-cells = <2>;
>> +                       #interrupt-cells = <1>;
>>                         #address-cells = <0>;
>>                         #size-cells = <0>;
>> -                       interrupt-map = <0x0 0 &combiner 23 3>,
>> -                                       <0x1 0 &combiner 23 4>,
>> -                                       <0x2 0 &combiner 25 2>,
>> -                                       <0x3 0 &combiner 25 3>,
>> -                                       <0x4 0 &gic 0 120 0>,
>> -                                       <0x5 0 &gic 0 121 0>;
>> +                       interrupt-map = <0 &combiner 23 3>,
>> +                                       <1 &combiner 23 4>,
>> +                                       <2 &combiner 25 2>,
>> +                                       <3 &combiner 25 3>,
>> +                                       <4 &gic 0 120 0>,
>> +                                       <5 &gic 0 121 0>;
>>                 };
>>         };
>>
>> --
>> 1.7.9.5
>>
>
>
>
> --
> with warm regards,
> Chander Kashyap
Kim Kukjin Aug. 18, 2013, 7:27 p.m. UTC | #3
On 08/12/13 15:23, Chander Kashyap wrote:
> ping
>
> On 23 July 2013 15:17, Chander Kashyap<chander.kashyap@linaro.org>  wrote:
>> ping.
>>
>> On 14 June 2013 20:11, Chander Kashyap<chander.kashyap@linaro.org>  wrote:
>>> Two cells were used to specify interrupts in mct node, while second cell
>>> always remains unused. Hence use only one cell.
>>> Suggested by Tomasz Figa.
>>>
>>> Signed-off-by: Chander Kashyap<chander.kashyap@linaro.org>
>>> ---
>>>   arch/arm/boot/dts/exynos4210.dtsi |   19 +++++++++----------
>>>   arch/arm/boot/dts/exynos4212.dtsi |   19 +++++++++----------
>>>   arch/arm/boot/dts/exynos4412.dtsi |   23 +++++++++++------------
>>>   arch/arm/boot/dts/exynos5250.dtsi |   19 +++++++++----------
>>>   4 files changed, 38 insertions(+), 42 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
>>> index 54710de..ad50010 100644
>>> --- a/arch/arm/boot/dts/exynos4210.dtsi
>>> +++ b/arch/arm/boot/dts/exynos4210.dtsi
>>> @@ -52,23 +52,22 @@
>>>                  compatible = "samsung,exynos4210-mct";
>>>                  reg =<0x10050000 0x800>;
>>>                  interrupt-controller;
>>> -               #interrups-cells =<2>;
>>> +               #interrups-cells =<1>;
>>>                  interrupt-parent =<&mct_map>;
>>> -               interrupts =<0 0>,<1 0>,<2 0>,<3 0>,
>>> -<4 0>,<5 0>;
>>> +               interrupts =<0>,<1>,<2>,<3>,<4>,<5>;
>>>                  clocks =<&clock 3>,<&clock 344>;
>>>                  clock-names = "fin_pll", "mct";
>>>
>>>                  mct_map: mct-map {
>>> -                       #interrupt-cells =<2>;
>>> +                       #interrupt-cells =<1>;
>>>                          #address-cells =<0>;
>>>                          #size-cells =<0>;
>>> -                       interrupt-map =<0x0 0&gic 0 57 0>,
>>> -<0x1 0&gic 0 69 0>,
>>> -<0x2 0&combiner 12 6>,
>>> -<0x3 0&combiner 12 7>,
>>> -<0x4 0&gic 0 42 0>,
>>> -<0x5 0&gic 0 48 0>;
>>> +                       interrupt-map =<0&gic 0 57 0>,
>>> +<1&gic 0 69 0>,
>>> +<2&combiner 12 6>,
>>> +<3&combiner 12 7>,
>>> +<4&gic 0 42 0>,
>>> +<5&gic 0 48 0>;
>>>                  };
>>>          };
>>>
>>> diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi
>>> index c0f60f4..ba9ada1 100644
>>> --- a/arch/arm/boot/dts/exynos4212.dtsi
>>> +++ b/arch/arm/boot/dts/exynos4212.dtsi
>>> @@ -39,21 +39,20 @@
>>>                  compatible = "samsung,exynos4412-mct";
>>>                  reg =<0x10050000 0x800>;
>>>                  interrupt-controller;
>>> -               #interrups-cells =<2>;
>>> +               #interrups-cells =<1>;
>>>                  interrupt-parent =<&mct_map>;
>>> -               interrupts =<0 0>,<1 0>,<2 0>,<3 0>,
>>> -<4 0>,<5 0>;
>>> +               interrupts =<0>,<1>,<2>,<3>,<4>,<5>;
>>>
>>>                  mct_map: mct-map {
>>> -                       #interrupt-cells =<2>;
>>> +                       #interrupt-cells =<>;
>>>                          #address-cells =<0>;
>>>                          #size-cells =<0>;
>>> -                       interrupt-map =<0x0 0&gic 0 57 0>,
>>> -<0x1 0&combiner 12 5>,
>>> -<0x2 0&combiner 12 6>,
>>> -<0x3 0&combiner 12 7>,
>>> -<0x4 0&gic 1 12 0>,
>>> -<0x5 0&gic 1 12 0>;
>>> +                       interrupt-map =<0&gic 0 57 0>,
>>> +<1&combiner 12 5>,
>>> +<2&combiner 12 6>,
>>> +<3&combiner 12 7>,
>>> +<4&gic 1 12 0>,
>>> +<5&gic 1 12 0>;
>>>                  };
>>>          };
>>>   };
>>> diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
>>> index 270b389..a680de7 100644
>>> --- a/arch/arm/boot/dts/exynos4412.dtsi
>>> +++ b/arch/arm/boot/dts/exynos4412.dtsi
>>> @@ -39,25 +39,24 @@
>>>                  compatible = "samsung,exynos4412-mct";
>>>                  reg =<0x10050000 0x800>;
>>>                  interrupt-controller;
>>> -               #interrups-cells =<2>;
>>> +               #interrups-cells =<1>;
>>>                  interrupt-parent =<&mct_map>;
>>> -               interrupts =<0 0>,<1 0>,<2 0>,<3 0>,
>>> -<4 0>,<5 0>,<6 0>,<7 0>;
>>> +               interrupts =<0>,<1>,<2>,<3>,<4>,<5>,<6>,<7>;
>>>                  clocks =<&clock 3>,<&clock 344>;
>>>                  clock-names = "fin_pll", "mct";
>>>
>>>                  mct_map: mct-map {
>>> -                       #interrupt-cells =<2>;
>>> +                       #interrupt-cells =<1>;
>>>                          #address-cells =<0>;
>>>                          #size-cells =<0>;
>>> -                       interrupt-map =<0x0 0&gic 0 57 0>,
>>> -<0x1 0&combiner 12 5>,
>>> -<0x2 0&combiner 12 6>,
>>> -<0x3 0&combiner 12 7>,
>>> -<0x4 0&gic 1 12 0>,
>>> -<0x5 0&gic 1 12 0>,
>>> -<0x6 0&gic 1 12 0>,
>>> -<0x7 0&gic 1 12 0>;
>>> +                       interrupt-map =<0&gic 0 57 0>,
>>> +<1&combiner 12 5>,
>>> +<2&combiner 12 6>,
>>> +<3&combiner 12 7>,
>>> +<4&gic 1 12 0>,
>>> +<5&gic 1 12 0>,
>>> +<6&gic 1 12 0>,
>>> +<7&gic 1 12 0>;
>>>                  };
>>>          };
>>>
>>> diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
>>> index a7cf3f5..4e633ef 100644
>>> --- a/arch/arm/boot/dts/exynos5250.dtsi
>>> +++ b/arch/arm/boot/dts/exynos5250.dtsi
>>> @@ -94,23 +94,22 @@
>>>                  compatible = "samsung,exynos4210-mct";
>>>                  reg =<0x101C0000 0x800>;
>>>                  interrupt-controller;
>>> -               #interrups-cells =<2>;
>>> +               #interrups-cells =<1>;
>>>                  interrupt-parent =<&mct_map>;
>>> -               interrupts =<0 0>,<1 0>,<2 0>,<3 0>,
>>> -<4 0>,<5 0>;
>>> +               interrupts =<0>,<1>,<2>,<3>,<4>,<5>;
>>>                  clocks =<&clock 1>,<&clock 335>;
>>>                  clock-names = "fin_pll", "mct";
>>>
>>>                  mct_map: mct-map {
>>> -                       #interrupt-cells =<2>;
>>> +                       #interrupt-cells =<1>;
>>>                          #address-cells =<0>;
>>>                          #size-cells =<0>;
>>> -                       interrupt-map =<0x0 0&combiner 23 3>,
>>> -<0x1 0&combiner 23 4>,
>>> -<0x2 0&combiner 25 2>,
>>> -<0x3 0&combiner 25 3>,
>>> -<0x4 0&gic 0 120 0>,
>>> -<0x5 0&gic 0 121 0>;
>>> +                       interrupt-map =<0&combiner 23 3>,
>>> +<1&combiner 23 4>,
>>> +<2&combiner 25 2>,
>>> +<3&combiner 25 3>,
>>> +<4&gic 0 120 0>,
>>> +<5&gic 0 121 0>;
>>>                  };
>>>          };
>>>
>>> --
>>> 1.7.9.5

Should be updated with regarding Doc.

Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Chander Kashyap Aug. 28, 2013, 9:50 a.m. UTC | #4
On 19 August 2013 00:57, Kukjin Kim <kgene.kim@samsung.com> wrote:
> On 08/12/13 15:23, Chander Kashyap wrote:
>>
>> ping
>>
>> On 23 July 2013 15:17, Chander Kashyap<chander.kashyap@linaro.org>  wrote:
>>>
>>> ping.
>>>
>>> On 14 June 2013 20:11, Chander Kashyap<chander.kashyap@linaro.org>
>>> wrote:
>>>>
>>>> Two cells were used to specify interrupts in mct node, while second cell
>>>> always remains unused. Hence use only one cell.
>>>> Suggested by Tomasz Figa.
>>>>
>>>> Signed-off-by: Chander Kashyap<chander.kashyap@linaro.org>
>>>> ---
>>>>   arch/arm/boot/dts/exynos4210.dtsi |   19 +++++++++----------
>>>>   arch/arm/boot/dts/exynos4212.dtsi |   19 +++++++++----------
>>>>   arch/arm/boot/dts/exynos4412.dtsi |   23 +++++++++++------------
>>>>   arch/arm/boot/dts/exynos5250.dtsi |   19 +++++++++----------
>>>>   4 files changed, 38 insertions(+), 42 deletions(-)
>>>>
>>>> diff --git a/arch/arm/boot/dts/exynos4210.dtsi
>>>> b/arch/arm/boot/dts/exynos4210.dtsi
>>>> index 54710de..ad50010 100644
>>>> --- a/arch/arm/boot/dts/exynos4210.dtsi
>>>> +++ b/arch/arm/boot/dts/exynos4210.dtsi
>>>> @@ -52,23 +52,22 @@
>>>>                  compatible = "samsung,exynos4210-mct";
>>>>                  reg =<0x10050000 0x800>;
>>>>                  interrupt-controller;
>>>> -               #interrups-cells =<2>;
>>>> +               #interrups-cells =<1>;
>>>>                  interrupt-parent =<&mct_map>;
>>>> -               interrupts =<0 0>,<1 0>,<2 0>,<3 0>,
>>>> -<4 0>,<5 0>;
>>>> +               interrupts =<0>,<1>,<2>,<3>,<4>,<5>;
>>>>                  clocks =<&clock 3>,<&clock 344>;
>>>>                  clock-names = "fin_pll", "mct";
>>>>
>>>>                  mct_map: mct-map {
>>>> -                       #interrupt-cells =<2>;
>>>> +                       #interrupt-cells =<1>;
>>>>                          #address-cells =<0>;
>>>>                          #size-cells =<0>;
>>>> -                       interrupt-map =<0x0 0&gic 0 57 0>,
>>>> -<0x1 0&gic 0 69 0>,
>>>> -<0x2 0&combiner 12 6>,
>>>> -<0x3 0&combiner 12 7>,
>>>> -<0x4 0&gic 0 42 0>,
>>>> -<0x5 0&gic 0 48 0>;
>>>> +                       interrupt-map =<0&gic 0 57 0>,
>>>> +<1&gic 0 69 0>,
>>>>
>>>> +<2&combiner 12 6>,
>>>> +<3&combiner 12 7>,
>>>> +<4&gic 0 42 0>,
>>>> +<5&gic 0 48 0>;
>>>>
>>>>                  };
>>>>          };
>>>>
>>>> diff --git a/arch/arm/boot/dts/exynos4212.dtsi
>>>> b/arch/arm/boot/dts/exynos4212.dtsi
>>>> index c0f60f4..ba9ada1 100644
>>>> --- a/arch/arm/boot/dts/exynos4212.dtsi
>>>> +++ b/arch/arm/boot/dts/exynos4212.dtsi
>>>> @@ -39,21 +39,20 @@
>>>>                  compatible = "samsung,exynos4412-mct";
>>>>                  reg =<0x10050000 0x800>;
>>>>                  interrupt-controller;
>>>> -               #interrups-cells =<2>;
>>>> +               #interrups-cells =<1>;
>>>>                  interrupt-parent =<&mct_map>;
>>>> -               interrupts =<0 0>,<1 0>,<2 0>,<3 0>,
>>>> -<4 0>,<5 0>;
>>>> +               interrupts =<0>,<1>,<2>,<3>,<4>,<5>;
>>>>
>>>>                  mct_map: mct-map {
>>>> -                       #interrupt-cells =<2>;
>>>> +                       #interrupt-cells =<>;
>>>>                          #address-cells =<0>;
>>>>                          #size-cells =<0>;
>>>> -                       interrupt-map =<0x0 0&gic 0 57 0>,
>>>> -<0x1 0&combiner 12 5>,
>>>> -<0x2 0&combiner 12 6>,
>>>> -<0x3 0&combiner 12 7>,
>>>> -<0x4 0&gic 1 12 0>,
>>>> -<0x5 0&gic 1 12 0>;
>>>> +                       interrupt-map =<0&gic 0 57 0>,
>>>> +<1&combiner 12 5>,
>>>> +<2&combiner 12 6>,
>>>> +<3&combiner 12 7>,
>>>> +<4&gic 1 12 0>,
>>>> +<5&gic 1 12 0>;
>>>>
>>>>                  };
>>>>          };
>>>>   };
>>>> diff --git a/arch/arm/boot/dts/exynos4412.dtsi
>>>> b/arch/arm/boot/dts/exynos4412.dtsi
>>>> index 270b389..a680de7 100644
>>>> --- a/arch/arm/boot/dts/exynos4412.dtsi
>>>> +++ b/arch/arm/boot/dts/exynos4412.dtsi
>>>> @@ -39,25 +39,24 @@
>>>>                  compatible = "samsung,exynos4412-mct";
>>>>                  reg =<0x10050000 0x800>;
>>>>                  interrupt-controller;
>>>> -               #interrups-cells =<2>;
>>>> +               #interrups-cells =<1>;
>>>>                  interrupt-parent =<&mct_map>;
>>>> -               interrupts =<0 0>,<1 0>,<2 0>,<3 0>,
>>>> -<4 0>,<5 0>,<6 0>,<7 0>;
>>>> +               interrupts =<0>,<1>,<2>,<3>,<4>,<5>,<6>,<7>;
>>>>                  clocks =<&clock 3>,<&clock 344>;
>>>>                  clock-names = "fin_pll", "mct";
>>>>
>>>>                  mct_map: mct-map {
>>>> -                       #interrupt-cells =<2>;
>>>> +                       #interrupt-cells =<1>;
>>>>                          #address-cells =<0>;
>>>>                          #size-cells =<0>;
>>>> -                       interrupt-map =<0x0 0&gic 0 57 0>,
>>>> -<0x1 0&combiner 12 5>,
>>>> -<0x2 0&combiner 12 6>,
>>>> -<0x3 0&combiner 12 7>,
>>>> -<0x4 0&gic 1 12 0>,
>>>> -<0x5 0&gic 1 12 0>,
>>>> -<0x6 0&gic 1 12 0>,
>>>> -<0x7 0&gic 1 12 0>;
>>>> +                       interrupt-map =<0&gic 0 57 0>,
>>>> +<1&combiner 12 5>,
>>>> +<2&combiner 12 6>,
>>>> +<3&combiner 12 7>,
>>>> +<4&gic 1 12 0>,
>>>> +<5&gic 1 12 0>,
>>>> +<6&gic 1 12 0>,
>>>> +<7&gic 1 12 0>;
>>>>
>>>>                  };
>>>>          };
>>>>
>>>> diff --git a/arch/arm/boot/dts/exynos5250.dtsi
>>>> b/arch/arm/boot/dts/exynos5250.dtsi
>>>> index a7cf3f5..4e633ef 100644
>>>> --- a/arch/arm/boot/dts/exynos5250.dtsi
>>>> +++ b/arch/arm/boot/dts/exynos5250.dtsi
>>>> @@ -94,23 +94,22 @@
>>>>                  compatible = "samsung,exynos4210-mct";
>>>>                  reg =<0x101C0000 0x800>;
>>>>                  interrupt-controller;
>>>> -               #interrups-cells =<2>;
>>>> +               #interrups-cells =<1>;
>>>>                  interrupt-parent =<&mct_map>;
>>>> -               interrupts =<0 0>,<1 0>,<2 0>,<3 0>,
>>>> -<4 0>,<5 0>;
>>>> +               interrupts =<0>,<1>,<2>,<3>,<4>,<5>;
>>>>                  clocks =<&clock 1>,<&clock 335>;
>>>>                  clock-names = "fin_pll", "mct";
>>>>
>>>>                  mct_map: mct-map {
>>>> -                       #interrupt-cells =<2>;
>>>> +                       #interrupt-cells =<1>;
>>>>                          #address-cells =<0>;
>>>>                          #size-cells =<0>;
>>>> -                       interrupt-map =<0x0 0&combiner 23 3>,
>>>> -<0x1 0&combiner 23 4>,
>>>> -<0x2 0&combiner 25 2>,
>>>> -<0x3 0&combiner 25 3>,
>>>> -<0x4 0&gic 0 120 0>,
>>>> -<0x5 0&gic 0 121 0>;
>>>>
>>>> +                       interrupt-map =<0&combiner 23 3>,
>>>> +<1&combiner 23 4>,
>>>> +<2&combiner 25 2>,
>>>> +<3&combiner 25 3>,
>>>> +<4&gic 0 120 0>,
>>>> +<5&gic 0 121 0>;
>>>>                  };
>>>>          };
>>>>
>>>> --
>>>> 1.7.9.5
>
>
> Should be updated with regarding Doc.

Will update the document.

Thanks.

>
> Kukjin
Tomasz Figa Aug. 28, 2013, 10:31 a.m. UTC | #5
Hi Chander,

On Wednesday 28 of August 2013 15:20:40 Chander Kashyap wrote:
> On 19 August 2013 00:57, Kukjin Kim <kgene.kim@samsung.com> wrote:
> > On 08/12/13 15:23, Chander Kashyap wrote:
> >> ping
> >> 
> >> On 23 July 2013 15:17, Chander Kashyap<chander.kashyap@linaro.org>  
wrote:
> >>> ping.
> >>> 
> >>> On 14 June 2013 20:11, Chander Kashyap<chander.kashyap@linaro.org>
> >>> 
> >>> wrote:
> >>>> Two cells were used to specify interrupts in mct node, while second
> >>>> cell
> >>>> always remains unused. Hence use only one cell.
> >>>> Suggested by Tomasz Figa.
> >>>> 
> >>>> Signed-off-by: Chander Kashyap<chander.kashyap@linaro.org>
> >>>> ---
> >>>> 
> >>>>   arch/arm/boot/dts/exynos4210.dtsi |   19 +++++++++----------
> >>>>   arch/arm/boot/dts/exynos4212.dtsi |   19 +++++++++----------
> >>>>   arch/arm/boot/dts/exynos4412.dtsi |   23 +++++++++++------------
> >>>>   arch/arm/boot/dts/exynos5250.dtsi |   19 +++++++++----------
> >>>>   4 files changed, 38 insertions(+), 42 deletions(-)
> >>>> 
[snip]
> > 
> > Should be updated with regarding Doc.
> 
> Will update the document.

Apparently I missed your patch and did the same change for Exynos 4 SoCs in 
my patch series[1] cleaning up Exynos 4 device tree files a bit.

Since in my series it is a part of a more complex change, i.e. moving mct 
node to exynos4x12.dtsi and update of MCT bindings documentation, would you 
mind if we could keep with my patch doing this change for Exynos 4 and 
yours taking care for Exynos 5?

The documentation is already being updated in my series, so you could just 
drop the changes done to exynos4*.dtsi files in next version.

[1] http://thread.gmane.org/gmane.linux.kernel.samsung-soc/22207

Best regards,
Tomasz

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Chander Kashyap Aug. 28, 2013, 10:48 a.m. UTC | #6
On 28 August 2013 16:01, Tomasz Figa <t.figa@samsung.com> wrote:
> Hi Chander,
>
> On Wednesday 28 of August 2013 15:20:40 Chander Kashyap wrote:
>> On 19 August 2013 00:57, Kukjin Kim <kgene.kim@samsung.com> wrote:
>> > On 08/12/13 15:23, Chander Kashyap wrote:
>> >> ping
>> >>
>> >> On 23 July 2013 15:17, Chander Kashyap<chander.kashyap@linaro.org>
> wrote:
>> >>> ping.
>> >>>
>> >>> On 14 June 2013 20:11, Chander Kashyap<chander.kashyap@linaro.org>
>> >>>
>> >>> wrote:
>> >>>> Two cells were used to specify interrupts in mct node, while second
>> >>>> cell
>> >>>> always remains unused. Hence use only one cell.
>> >>>> Suggested by Tomasz Figa.
>> >>>>
>> >>>> Signed-off-by: Chander Kashyap<chander.kashyap@linaro.org>
>> >>>> ---
>> >>>>
>> >>>>   arch/arm/boot/dts/exynos4210.dtsi |   19 +++++++++----------
>> >>>>   arch/arm/boot/dts/exynos4212.dtsi |   19 +++++++++----------
>> >>>>   arch/arm/boot/dts/exynos4412.dtsi |   23 +++++++++++------------
>> >>>>   arch/arm/boot/dts/exynos5250.dtsi |   19 +++++++++----------
>> >>>>   4 files changed, 38 insertions(+), 42 deletions(-)
>> >>>>
> [snip]
>> >
>> > Should be updated with regarding Doc.
>>
>> Will update the document.
>
> Apparently I missed your patch and did the same change for Exynos 4 SoCs in
> my patch series[1] cleaning up Exynos 4 device tree files a bit.
>
> Since in my series it is a part of a more complex change, i.e. moving mct
> node to exynos4x12.dtsi and update of MCT bindings documentation, would you
> mind if we could keep with my patch doing this change for Exynos 4 and
> yours taking care for Exynos 5?
>
> The documentation is already being updated in my series, so you could just
> drop the changes done to exynos4*.dtsi files in next version.

Ok, That make sense.
I will post patche with changes for exynos5, only

>
> [1] http://thread.gmane.org/gmane.linux.kernel.samsung-soc/22207
>
> Best regards,
> Tomasz
>
diff mbox

Patch

diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 54710de..ad50010 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -52,23 +52,22 @@ 
 		compatible = "samsung,exynos4210-mct";
 		reg = <0x10050000 0x800>;
 		interrupt-controller;
-		#interrups-cells = <2>;
+		#interrups-cells = <1>;
 		interrupt-parent = <&mct_map>;
-		interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
-			     <4 0>, <5 0>;
+		interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
 		clocks = <&clock 3>, <&clock 344>;
 		clock-names = "fin_pll", "mct";
 
 		mct_map: mct-map {
-			#interrupt-cells = <2>;
+			#interrupt-cells = <1>;
 			#address-cells = <0>;
 			#size-cells = <0>;
-			interrupt-map = <0x0 0 &gic 0 57 0>,
-					<0x1 0 &gic 0 69 0>,
-					<0x2 0 &combiner 12 6>,
-					<0x3 0 &combiner 12 7>,
-					<0x4 0 &gic 0 42 0>,
-					<0x5 0 &gic 0 48 0>;
+			interrupt-map = <0 &gic 0 57 0>,
+					<1 &gic 0 69 0>,
+					<2 &combiner 12 6>,
+					<3 &combiner 12 7>,
+					<4 &gic 0 42 0>,
+					<5 &gic 0 48 0>;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi
index c0f60f4..ba9ada1 100644
--- a/arch/arm/boot/dts/exynos4212.dtsi
+++ b/arch/arm/boot/dts/exynos4212.dtsi
@@ -39,21 +39,20 @@ 
 		compatible = "samsung,exynos4412-mct";
 		reg = <0x10050000 0x800>;
 		interrupt-controller;
-		#interrups-cells = <2>;
+		#interrups-cells = <1>;
 		interrupt-parent = <&mct_map>;
-		interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
-			     <4 0>, <5 0>;
+		interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
 
 		mct_map: mct-map {
-			#interrupt-cells = <2>;
+			#interrupt-cells = <>;
 			#address-cells = <0>;
 			#size-cells = <0>;
-			interrupt-map = <0x0 0 &gic 0 57 0>,
-					<0x1 0 &combiner 12 5>,
-					<0x2 0 &combiner 12 6>,
-					<0x3 0 &combiner 12 7>,
-					<0x4 0 &gic 1 12 0>,
-					<0x5 0 &gic 1 12 0>;
+			interrupt-map = <0 &gic 0 57 0>,
+					<1 &combiner 12 5>,
+					<2 &combiner 12 6>,
+					<3 &combiner 12 7>,
+					<4 &gic 1 12 0>,
+					<5 &gic 1 12 0>;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index 270b389..a680de7 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -39,25 +39,24 @@ 
 		compatible = "samsung,exynos4412-mct";
 		reg = <0x10050000 0x800>;
 		interrupt-controller;
-		#interrups-cells = <2>;
+		#interrups-cells = <1>;
 		interrupt-parent = <&mct_map>;
-		interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
-			     <4 0>, <5 0>, <6 0>, <7 0>;
+		interrupts = <0>, <1>, <2>, <3>, <4>, <5>, <6>, <7>;
 		clocks = <&clock 3>, <&clock 344>;
 		clock-names = "fin_pll", "mct";
 
 		mct_map: mct-map {
-			#interrupt-cells = <2>;
+			#interrupt-cells = <1>;
 			#address-cells = <0>;
 			#size-cells = <0>;
-			interrupt-map = <0x0 0 &gic 0 57 0>,
-					<0x1 0 &combiner 12 5>,
-					<0x2 0 &combiner 12 6>,
-					<0x3 0 &combiner 12 7>,
-					<0x4 0 &gic 1 12 0>,
-					<0x5 0 &gic 1 12 0>,
-					<0x6 0 &gic 1 12 0>,
-					<0x7 0 &gic 1 12 0>;
+			interrupt-map = <0 &gic 0 57 0>,
+					<1 &combiner 12 5>,
+					<2 &combiner 12 6>,
+					<3 &combiner 12 7>,
+					<4 &gic 1 12 0>,
+					<5 &gic 1 12 0>,
+					<6 &gic 1 12 0>,
+					<7 &gic 1 12 0>;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index a7cf3f5..4e633ef 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -94,23 +94,22 @@ 
 		compatible = "samsung,exynos4210-mct";
 		reg = <0x101C0000 0x800>;
 		interrupt-controller;
-		#interrups-cells = <2>;
+		#interrups-cells = <1>;
 		interrupt-parent = <&mct_map>;
-		interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
-			     <4 0>, <5 0>;
+		interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
 		clocks = <&clock 1>, <&clock 335>;
 		clock-names = "fin_pll", "mct";
 
 		mct_map: mct-map {
-			#interrupt-cells = <2>;
+			#interrupt-cells = <1>;
 			#address-cells = <0>;
 			#size-cells = <0>;
-			interrupt-map = <0x0 0 &combiner 23 3>,
-					<0x1 0 &combiner 23 4>,
-					<0x2 0 &combiner 25 2>,
-					<0x3 0 &combiner 25 3>,
-					<0x4 0 &gic 0 120 0>,
-					<0x5 0 &gic 0 121 0>;
+			interrupt-map = <0 &combiner 23 3>,
+					<1 &combiner 23 4>,
+					<2 &combiner 25 2>,
+					<3 &combiner 25 3>,
+					<4 &gic 0 120 0>,
+					<5 &gic 0 121 0>;
 		};
 	};