[v2,4/7] ARM: at91/dt: sama5d2: add pio controller node
diff mbox

Message ID 1442417823-15850-5-git-send-email-ludovic.desroches@atmel.com
State New
Headers show

Commit Message

ludovic.desroches@atmel.com Sept. 16, 2015, 3:37 p.m. UTC
Add pio4 controller node to enable pinmux and gpio.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
---
 arch/arm/boot/dts/sama5d2.dtsi | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

Comments

Linus Walleij Sept. 21, 2015, 6:24 p.m. UTC | #1
On Wed, Sep 16, 2015 at 8:37 AM, Ludovic Desroches
<ludovic.desroches@atmel.com> wrote:

> Add pio4 controller node to enable pinmux and gpio.
>
> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>

Patch applied.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Olof Johansson Nov. 10, 2015, 12:30 a.m. UTC | #2
Hi Linus,

On Mon, Sep 21, 2015 at 11:24 AM, Linus Walleij
<linus.walleij@linaro.org> wrote:
> On Wed, Sep 16, 2015 at 8:37 AM, Ludovic Desroches
> <ludovic.desroches@atmel.com> wrote:
>
>> Add pio4 controller node to enable pinmux and gpio.
>>
>> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
>
> Patch applied.

Please don't merge DT changes through driver trees unless there's a
very specific reason to do so, since it introduces random conflicts.


Thanks!

-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Linus Walleij Nov. 17, 2015, 11:06 a.m. UTC | #3
On Tue, Nov 10, 2015 at 1:30 AM, Olof Johansson <olof@lixom.net> wrote:
> On Mon, Sep 21, 2015 at 11:24 AM, Linus Walleij
> <linus.walleij@linaro.org> wrote:
>> On Wed, Sep 16, 2015 at 8:37 AM, Ludovic Desroches
>> <ludovic.desroches@atmel.com> wrote:
>>
>>> Add pio4 controller node to enable pinmux and gpio.
>>>
>>> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
>>
>> Patch applied.
>
> Please don't merge DT changes through driver trees unless there's a
> very specific reason to do so, since it introduces random conflicts.

Sorry :(

Even noted this in the pull request to Torvalds, it was in the bottom
of my patch stack so had been in -next for ages, I was afraid it
would create more problem than it solves if I reverted the patch,
but I guess I should have done so anyways.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Olof Johansson Nov. 17, 2015, 7:15 p.m. UTC | #4
On Tue, Nov 17, 2015 at 3:06 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Tue, Nov 10, 2015 at 1:30 AM, Olof Johansson <olof@lixom.net> wrote:
>> On Mon, Sep 21, 2015 at 11:24 AM, Linus Walleij
>> <linus.walleij@linaro.org> wrote:
>>> On Wed, Sep 16, 2015 at 8:37 AM, Ludovic Desroches
>>> <ludovic.desroches@atmel.com> wrote:
>>>
>>>> Add pio4 controller node to enable pinmux and gpio.
>>>>
>>>> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
>>>
>>> Patch applied.
>>
>> Please don't merge DT changes through driver trees unless there's a
>> very specific reason to do so, since it introduces random conflicts.
>
> Sorry :(
>
> Even noted this in the pull request to Torvalds, it was in the bottom
> of my patch stack so had been in -next for ages, I was afraid it
> would create more problem than it solves if I reverted the patch,
> but I guess I should have done so anyways.

Yeah, it's OK -- I spotted that pull request later as well.

It's not a big deal in most specific instances, I'd say. It's just in
aggregate it becomes a bother.

So, just see this as a public reminder since we've seen it creep into
other driver trees a bit more lately. Mistakes will still happen but
try to keep it down. And for those who submit patches, feel free to
point out in the patch that you don't expect the driver/subsystem
maintainer to apply it to help them out.


-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
ludovic.desroches@atmel.com Nov. 18, 2015, 7:25 a.m. UTC | #5
On Tue, Nov 17, 2015 at 11:15:11AM -0800, Olof Johansson wrote:
> On Tue, Nov 17, 2015 at 3:06 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
> > On Tue, Nov 10, 2015 at 1:30 AM, Olof Johansson <olof@lixom.net> wrote:
> >> On Mon, Sep 21, 2015 at 11:24 AM, Linus Walleij
> >> <linus.walleij@linaro.org> wrote:
> >>> On Wed, Sep 16, 2015 at 8:37 AM, Ludovic Desroches
> >>> <ludovic.desroches@atmel.com> wrote:
> >>>
> >>>> Add pio4 controller node to enable pinmux and gpio.
> >>>>
> >>>> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
> >>>
> >>> Patch applied.
> >>
> >> Please don't merge DT changes through driver trees unless there's a
> >> very specific reason to do so, since it introduces random conflicts.
> >
> > Sorry :(
> >
> > Even noted this in the pull request to Torvalds, it was in the bottom
> > of my patch stack so had been in -next for ages, I was afraid it
> > would create more problem than it solves if I reverted the patch,
> > but I guess I should have done so anyways.
> 
> Yeah, it's OK -- I spotted that pull request later as well.
> 
> It's not a big deal in most specific instances, I'd say. It's just in
> aggregate it becomes a bother.
> 
> So, just see this as a public reminder since we've seen it creep into
> other driver trees a bit more lately. Mistakes will still happen but
> try to keep it down. And for those who submit patches, feel free to
> point out in the patch that you don't expect the driver/subsystem
> maintainer to apply it to help them out.
> 

Ok. Sorry, I didn't think it could cause so many conflicts if not taken
by Nicolas.


Ludovic
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index 034cd48..cc05cde 100644
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -921,6 +921,20 @@ 
 				clocks = <&twi1_clk>;
 				status = "disabled";
 			};
+
+			pioA: pinctrl@fc038000 {
+				compatible = "atmel,sama5d2-pinctrl";
+				reg = <0xfc038000 0x600>;
+				interrupts = <18 IRQ_TYPE_LEVEL_HIGH 7>,
+					     <68 IRQ_TYPE_LEVEL_HIGH 7>,
+					     <69 IRQ_TYPE_LEVEL_HIGH 7>,
+					     <70 IRQ_TYPE_LEVEL_HIGH 7>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				clocks = <&pioA_clk>;
+			};
 		};
 	};
 };