Re: [PATCH] arm64: dts: marvell: mcbin: fix PCIe reset signal

Hi Baruch,

(adding Arnd and Olof)
 
 On mar., déc. 11 2018, Baruch Siach [off-list ref] wrote:

Hi Gregory,

Gregory CLEMENT writes:

quoted

 On lun., déc. 10 2018, Baruch Siach [off-list ref] wrote:

quoted

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

quoted

quoted

---
 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