From: Gregory CLEMENT <gregory.clement@bootlin.com>
To: Baruch Siach <baruch@tkos.co.il>, Arnd Bergmann <arnd@arndb.de>,
Olof Johansson <olof@lixom.net>
Cc: Russell King <linux@armlinux.org.uk>,
Andrew Lunn <andrew@lunn.ch>, Jason Cooper <jason@lakedaemon.net>,
linux-arm-kernel@lists.infradead.org,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Subject: Re: [PATCH] arm64: dts: marvell: mcbin: fix PCIe reset signal
Date: Wed, 12 Dec 2018 09:09:38 +0100 [thread overview]
Message-ID: <87sgz3rwsd.fsf@bootlin.com> (raw)
In-Reply-To: <87bm5s6le6.fsf@tkos.co.il> (Baruch Siach's message of "Tue, 11 Dec 2018 19:09:05 +0200")
Hi Baruch,
(adding Arnd and Olof)
On mar., déc. 11 2018, Baruch Siach <baruch@tkos.co.il> wrote:
> Hi Gregory,
>
> Gregory CLEMENT writes:
>> On lun., déc. 10 2018, Baruch Siach <baruch@tkos.co.il> wrote:
>>
>>> The MPP52 signal is on the seconds GPIO instance of CP0, which
>>> corresponds to the &cp0_gpio2 handle.
>>>
>>> Rename the property name to the standard '-gpios' suffix while at it.
>>>
>>> Fixes: b83e1669adce6 ("arm64: dts: marvell: mcbin: add support for PCIe")
>>> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>>
>> With the last change in armada-8040-mcbin.dts this patch no more apply
>> on mvebu/dt64.
>
> I thought that this fix should go to 4.20. I will generate a patch against
> mvebu/dt64 if you prefer.
Actually I can apply it on mvebu/fixes but later when all the mvebu will
be merged in the Linus Torvald's tree through the arm-soc tree there
will be a conflict.
Arnd, Olof,
How should I handle this situation?
Is it acceptable to do a pull request of an mvebu/dt64 branch based on
the mvebu/fixes branch?
In this case I could amend the commit in mvebu/dt64 to fix the conflict.
Gregory
>
> baruch
>
>>> ---
>>> arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
>>> index 56fa44860909..46dacfc08cec 100644
>>> --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
>>> +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
>>> @@ -183,7 +183,7 @@
>>> pinctrl-0 = <&cp0_pcie_pins>;
>>> num-lanes = <4>;
>>> num-viewport = <8>;
>>> - reset-gpio = <&cp0_gpio1 20 GPIO_ACTIVE_LOW>;
>>> + reset-gpios = <&cp0_gpio2 20 GPIO_ACTIVE_LOW>;
>>> status = "okay";
>>> };
>
> --
> http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
> =}------------------------------------------------ooO--U--Ooo------------{=
> - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
--
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
prev parent reply other threads:[~2018-12-12 8:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-10 11:38 [PATCH] arm64: dts: marvell: mcbin: fix PCIe reset signal Baruch Siach
2018-12-11 15:31 ` Gregory CLEMENT
2018-12-11 17:09 ` Baruch Siach
2018-12-12 8:09 ` Gregory CLEMENT [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sgz3rwsd.fsf@bootlin.com \
--to=gregory.clement@bootlin.com \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=baruch@tkos.co.il \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=olof@lixom.net \
--cc=sebastian.hesselbarth@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).