2017-03-28 19:26:17

by Vivien Didelot

[permalink] [raw]
Subject: [PATCH] ARM: dts: vf610-zii-dev-rev-b: change switch2 label

Rename the switch2@0 label of the switch2 node to switch@0 to respect
the general unit@address DTS rule, and be consistent with the other
switch nodes of the DTS file.

Signed-off-by: Vivien Didelot <[email protected]>
---
arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
index 7940408838df..5a93f2d875b1 100644
--- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
+++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
@@ -239,7 +239,7 @@
#size-cells = <0>;
reg = <4>;

- switch2: switch2@0 {
+ switch2: switch@0 {
compatible = "marvell,mv88e6085";
#address-cells = <1>;
#size-cells = <0>;
--
2.12.1


2017-03-28 19:33:44

by Andrew Lunn

[permalink] [raw]
Subject: Re: [PATCH] ARM: dts: vf610-zii-dev-rev-b: change switch2 label

On Tue, Mar 28, 2017 at 03:24:26PM -0400, Vivien Didelot wrote:
> Rename the switch2@0 label of the switch2 node to switch@0 to respect
> the general unit@address DTS rule, and be consistent with the other
> switch nodes of the DTS file.
>
> Signed-off-by: Vivien Didelot <[email protected]>

Hi Vivien

You might need to rebase this onto

git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git

There have been a few other changes to the ZII dts files this cycle.

Reviewed-by: Andrew Lunn <[email protected]>

Andrew

2017-03-28 20:06:43

by Vivien Didelot

[permalink] [raw]
Subject: Re: [PATCH] ARM: dts: vf610-zii-dev-rev-b: change switch2 label

Hi Andrew,

Andrew Lunn <[email protected]> writes:

> You might need to rebase this onto
>
> git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
>
> There have been a few other changes to the ZII dts files this cycle.

This patch applies correctly on shawnguo/for-next. Is it the correct
branch to rebase onto?

Thanks,

Vivien

2017-03-29 03:50:37

by Shawn Guo

[permalink] [raw]
Subject: Re: [PATCH] ARM: dts: vf610-zii-dev-rev-b: change switch2 label

On Tue, Mar 28, 2017 at 03:24:26PM -0400, Vivien Didelot wrote:
> Rename the switch2@0 label of the switch2 node to switch@0 to respect
> the general unit@address DTS rule, and be consistent with the other
> switch nodes of the DTS file.
>
> Signed-off-by: Vivien Didelot <[email protected]>

Applied, thanks.