* [PATCH] arm64: dts: marvell: mcbin: fix PCIe reset signal
@ 2018-12-10 11:38 Baruch Siach
2018-12-11 15:31 ` Gregory CLEMENT
0 siblings, 1 reply; 4+ messages in thread
From: Baruch Siach @ 2018-12-10 11:38 UTC (permalink / raw)
To: Jason Cooper, Andrew Lunn, Gregory Clement, Sebastian Hesselbarth,
Russell King
Cc: Baruch Siach, linux-arm-kernel
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>
---
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";
};
--
2.19.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] arm64: dts: marvell: mcbin: fix PCIe reset signal
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
0 siblings, 1 reply; 4+ messages in thread
From: Gregory CLEMENT @ 2018-12-11 15:31 UTC (permalink / raw)
To: Baruch Siach
Cc: Russell King, Andrew Lunn, Jason Cooper, linux-arm-kernel,
Sebastian Hesselbarth
Hi Baruch,
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.
Gregory
> ---
> 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";
> };
>
> --
> 2.19.2
>
--
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] arm64: dts: marvell: mcbin: fix PCIe reset signal
2018-12-11 15:31 ` Gregory CLEMENT
@ 2018-12-11 17:09 ` Baruch Siach
2018-12-12 8:09 ` Gregory CLEMENT
0 siblings, 1 reply; 4+ messages in thread
From: Baruch Siach @ 2018-12-11 17:09 UTC (permalink / raw)
To: Gregory CLEMENT
Cc: Russell King, Andrew Lunn, Jason Cooper, linux-arm-kernel,
Sebastian Hesselbarth
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.
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 -
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] arm64: dts: marvell: mcbin: fix PCIe reset signal
2018-12-11 17:09 ` Baruch Siach
@ 2018-12-12 8:09 ` Gregory CLEMENT
0 siblings, 0 replies; 4+ messages in thread
From: Gregory CLEMENT @ 2018-12-12 8:09 UTC (permalink / raw)
To: Baruch Siach, Arnd Bergmann, Olof Johansson
Cc: Russell King, Andrew Lunn, Jason Cooper, linux-arm-kernel,
Sebastian Hesselbarth
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-12 8:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).