arm64: dts: marvell: mcbin: fix PCIe reset signal
diff mbox series

Message ID 8a9652066a649b5349b76c823bef946024161275.1544441887.git.baruch@tkos.co.il
State New
Headers show
Series
  • arm64: dts: marvell: mcbin: fix PCIe reset signal
Related show

Commit Message

Baruch Siach Dec. 10, 2018, 11:38 a.m. UTC
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(-)

Comments

Gregory CLEMENT Dec. 11, 2018, 3:31 p.m. UTC | #1
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
>
Baruch Siach Dec. 11, 2018, 5:09 p.m. UTC | #2
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";
>>  };
Gregory CLEMENT Dec. 12, 2018, 8:09 a.m. UTC | #3
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 -

Patch
diff mbox series

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";
 };