| Message ID | 1421422267-2934-3-git-send-email-ludovic.desroches@atmel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Le 16/01/2015 16:31, Ludovic Desroches a écrit : > PioD controller was not described in the device tree since we don't use > it. As pinctrl-at91 allows disabled gpio controllers in the device > tree, we can add it to complete the device description. > > Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Linus, As there is no dependency with the other patches in the series, I can take this patch or you can keep it together with the other ones. Just tell me once we agree all on a solution. Bye, > --- > arch/arm/boot/dts/sama5d4.dtsi | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi > index 1b0f30c..368973e 100644 > --- a/arch/arm/boot/dts/sama5d4.dtsi > +++ b/arch/arm/boot/dts/sama5d4.dtsi > @@ -62,6 +62,7 @@ > gpio0 = &pioA; > gpio1 = &pioB; > gpio2 = &pioC; > + gpio3 = &pioD; > gpio4 = &pioE; > tcb0 = &tcb0; > tcb1 = &tcb1; > @@ -1111,6 +1112,18 @@ > clocks = <&pioC_clk>; > }; > > + pioD: gpio@fc068000 { > + compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; > + reg = <0xfc068000 0x100>; > + interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>; > + #gpio-cells = <2>; > + gpio-controller; > + interrupt-controller; > + #interrupt-cells = <2>; > + clocks = <&pioD_clk>; > + status = "disabled"; > + }; > + > pioE: gpio@fc06d000 { > compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; > reg = <0xfc06d000 0x100>; >
On Mon, Jan 19, 2015 at 11:46 AM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote: > Le 16/01/2015 16:31, Ludovic Desroches a écrit : >> PioD controller was not described in the device tree since we don't use >> it. As pinctrl-at91 allows disabled gpio controllers in the device >> tree, we can add it to complete the device description. >> >> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> > > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > Linus, > > As there is no dependency with the other patches in the series, I can > take this patch or you can keep it together with the other ones. Just > tell me once we agree all on a solution. Please take this patch along with other AT91 stuff upstream through ARM SoC. Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
Le 21/01/2015 10:49, Linus Walleij a écrit : > On Mon, Jan 19, 2015 at 11:46 AM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote: >> Le 16/01/2015 16:31, Ludovic Desroches a écrit : >>> PioD controller was not described in the device tree since we don't use >>> it. As pinctrl-at91 allows disabled gpio controllers in the device >>> tree, we can add it to complete the device description. >>> >>> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> >> >> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> >> >> Linus, >> >> As there is no dependency with the other patches in the series, I can >> take this patch or you can keep it together with the other ones. Just >> tell me once we agree all on a solution. > > Please take this patch along with other AT91 stuff upstream > through ARM SoC. > Acked-by: Linus Walleij <linus.walleij@linaro.org> Ok, it is now stacked on top of our at91-3.20-dt branch and I'll send it to arm-soc soon. Thanks, bye.
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi index 1b0f30c..368973e 100644 --- a/arch/arm/boot/dts/sama5d4.dtsi +++ b/arch/arm/boot/dts/sama5d4.dtsi @@ -62,6 +62,7 @@ gpio0 = &pioA; gpio1 = &pioB; gpio2 = &pioC; + gpio3 = &pioD; gpio4 = &pioE; tcb0 = &tcb0; tcb1 = &tcb1; @@ -1111,6 +1112,18 @@ clocks = <&pioC_clk>; }; + pioD: gpio@fc068000 { + compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; + reg = <0xfc068000 0x100>; + interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>; + #gpio-cells = <2>; + gpio-controller; + interrupt-controller; + #interrupt-cells = <2>; + clocks = <&pioD_clk>; + status = "disabled"; + }; + pioE: gpio@fc06d000 { compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; reg = <0xfc06d000 0x100>;
PioD controller was not described in the device tree since we don't use it. As pinctrl-at91 allows disabled gpio controllers in the device tree, we can add it to complete the device description. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> --- arch/arm/boot/dts/sama5d4.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+)