2016-03-23 22:24:32

by Andreas Färber

Subject: [PATCH 4/4] arm64: dts: marvell: Rename armada-ap806 XOR nodes

Node names should not contain an instance number, the unit address
serves to distinguish nodes of the same name. So rename the XOR nodes
to just xor@address, using xorX as label instead.

Fixes: ec7e5a569bce ("arm64: dts: marvell: add Device Tree files for Armada 7K/8K")
Cc: Thomas Petazzoni <[email protected]>
Signed-off-by: Andreas Färber <[email protected]>
---
"marvell,mv-xor-v2" is not yet referenced from any driver in next-20160323.

arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 3ecf9b1798fa..dd6e48a952ac 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -135,7 +135,7 @@
marvell,spi-base = <128>, <136>, <144>, <152>;
};

- xor0@400000 {
+ xor0: xor@400000 {
compatible = "marvell,mv-xor-v2";
reg = <0x400000 0x1000>,
<0x410000 0x1000>;
@@ -143,7 +143,7 @@
dma-coherent;
};

- xor1@420000 {
+ xor1: xor@420000 {
compatible = "marvell,mv-xor-v2";
reg = <0x420000 0x1000>,
<0x430000 0x1000>;
@@ -151,7 +151,7 @@
dma-coherent;
};

- xor2@440000 {
+ xor2: xor@440000 {
compatible = "marvell,mv-xor-v2";
reg = <0x440000 0x1000>,
<0x450000 0x1000>;
@@ -159,7 +159,7 @@
dma-coherent;
};

- xor3@460000 {
+ xor3: xor@460000 {
compatible = "marvell,mv-xor-v2";
reg = <0x460000 0x1000>,
<0x470000 0x1000>;
--
2.6.2

2016-03-24 08:17:39

by Thomas Petazzoni

Subject: Re: [PATCH 4/4] arm64: dts: marvell: Rename armada-ap806 XOR nodes

Hello,

On Wed, 23 Mar 2016 23:24:21 +0100, Andreas Färber wrote:
> Node names should not contain an instance number, the unit address
> serves to distinguish nodes of the same name. So rename the XOR nodes
> to just xor@address, using xorX as label instead.
>
> Fixes: ec7e5a569bce ("arm64: dts: marvell: add Device Tree files for Armada 7K/8K")
> Cc: Thomas Petazzoni <[email protected]>
> Signed-off-by: Andreas Färber <[email protected]>

Removing the instance number from the node name is obviously good.
However, I don't think it's really needed to add labels. The XOR
engines are purely "internal" devices, so they are always enabled at
the SoC level.

> "marvell,mv-xor-v2" is not yet referenced from any driver in next-20160323.

Yes. The driver has been submitted, but has received some comments that
I need to address.

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com