Skip to contentSkip to conversation

ARM: dts: Convert Linkstation Mini to Device Tree

PATCH Superseded Benjamin Cama 3 participants 6 messages Aug 6, 2015

Subsystems (5)
Device tree bindings Arm (32-bit) Arm sub-architectures Arm and arm64 SoC sub-architectures (common parts) +1 more subsystems
lore
Share & tools
lore

Benjamin Cama

author
#0 lore raw

PATCH v3 1/1 ARM: dts: Convert Linkstation Mini to Device Tree

The title says it all. The name of the dts file as been changed to better reflect the manufacturer's device name (LS-WSGL), rather than the original "lsmini", which exists in a kirkwood version too.

Signed-off-by Benjamin Cama <[email protected]>

---
Since v2, I re-ordered the dts in the Makefile, and removed the makefile rule for the old .c file.

Thanks everyone for your support in guiding me to make the patch acceptable.

 arch/arm/boot/dts/Makefile           |   1 +
 arch/arm/boot/dts/orion5x-lswsgl.dts | 276 ++++++++++++++++++++++++++++++++++
 arch/arm/mach-orion5x/Kconfig        |   6 +-
 arch/arm/mach-orion5x/Makefile       |   1 -
 arch/arm/mach-orion5x/lsmini-setup.c | 280 -----------------------------------
 5 files changed, 280 insertions(+), 284 deletions(-)
 create mode 100644 arch/arm/boot/dts/orion5x-lswsgl.dts
 delete mode 100644 arch/arm/mach-orion5x/lsmini-setup.c
arch/arm/boot/dts/Makefile +1 -0
index 992736b..65fc046 100644
@@ -440,6 +440,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \
 dtb-$(CONFIG_ARCH_ORION5X) += \
 	orion5x-lacie-d2-network.dtb \
 	orion5x-lacie-ethernet-disk-mini-v2.dtb \
+	orion5x-lswsgl.dtb \
 	orion5x-maxtor-shared-storage-2.dtb \
 	orion5x-rd88f5182-nas.dtb
 dtb-$(CONFIG_ARCH_PRIMA2) += \
arch/arm/boot/dts/orion5x-lswsgl.dts new file +276 -0

276 lines not on this page · raw message

arch/arm/mach-orion5x/Kconfig +3 -3
index 2412efb..08d2be2 100644
@@ -78,11 +78,11 @@ config MACH_LINKSTATION_LSCHL
 	  Buffalo Linkstation Live v3 (LS-CHL) platform.
 
 config MACH_LINKSTATION_MINI
-	bool "Buffalo Linkstation Mini"
-	select I2C_BOARDINFO
+	bool "Buffalo Linkstation Mini (Flattened Device Tree)"
+	select ARCH_ORION5X_DT
 	help
 	  Say 'Y' here if you want your kernel to support the
-	  Buffalo Linkstation Mini platform.
+	  Buffalo Linkstation Mini (LS-WSGL) platform.
 
 config MACH_LINKSTATION_LS_HGL
 	bool "Buffalo Linkstation LS-HGL"
arch/arm/mach-orion5x/Makefile +0 -1
index a40b5c9..a1e0fbe 100644
@@ -4,7 +4,6 @@ obj-$(CONFIG_MACH_RD88F5182)	+= rd88f5182-setup.o
 obj-$(CONFIG_MACH_KUROBOX_PRO)	+= kurobox_pro-setup.o
 obj-$(CONFIG_MACH_TERASTATION_PRO2)	+= terastation_pro2-setup.o
 obj-$(CONFIG_MACH_LINKSTATION_PRO) += kurobox_pro-setup.o
-obj-$(CONFIG_MACH_LINKSTATION_MINI) += lsmini-setup.o
 obj-$(CONFIG_MACH_LINKSTATION_LS_HGL) += ls_hgl-setup.o
 obj-$(CONFIG_MACH_DNS323)	+= dns323-setup.o
 obj-$(CONFIG_MACH_TS209)	+= ts209-setup.o tsx09-common.o
arch/arm/mach-orion5x/lsmini-setup.c deleted +0 -280

280 lines not on this page · raw message

Signature · 1 line
2.1.4
maintainer
#1 lore raw

PATCH v3 1/1 ARM: dts: Convert Linkstation Mini to Device Tree

Quoted 5 lines · Benjamin Cama

The title says it all. The name of the dts file as been changed to better reflect the manufacturer's device name (LS-WSGL), rather than the original "lsmini", which exists in a kirkwood version too.

Signed-off-by Benjamin Cama <[email protected]>

Hi Benjamin

It would be normal to add the various Acked-by: here, both Alexey and mine. It is not an issue, Gregory can add them, when he adds is own. I'm just mentioning it for any future patches you might submit.

Thanks for the good work converting this,

Andrew

author
#2 lore raw

PATCH v3 1/1 ARM: dts: Convert Linkstation Mini to Device Tree

Hi Andrew,

Le jeudi 06 ao?t 2015 ? 18:34 +0200, Andrew Lunn a ?crit :

Quoted 6 lines · Benjamin Cama
Quoted 5 lines

The title says it all. The name of the dts file as been changed to better reflect the manufacturer's device name (LS-WSGL), rather than
the original "lsmini", which exists in a kirkwood version too.

Quoted 7 lines
Quoted 1 line
Signed-off-by Benjamin Cama <[email protected]>

Hi Benjamin

It would be normal to add the various Acked-by: here, both Alexey and mine. It is not an issue, Gregory can add them, when he adds is own. I'm just mentioning it for any future patches you might submit.

Ah, OK, I was not sure and didn't want to add them by mistake.

Quoted 1 line

Thanks for the good work converting this,

Thanks!
--
benjamin

#3 lore raw

PATCH v3 1/1 ARM: dts: Convert Linkstation Mini to Device Tree

Hi Benjamin,

Quoted 11 lines · Benjamin Cama

Hi Andrew,

Le jeudi 06 ao?t 2015 ? 18:34 +0200, Andrew Lunn a ?crit :

Quoted 8 lines · Benjamin Cama
Quoted 6 lines

The title says it all. The name of the dts file as been changed to better reflect the manufacturer's device name (LS-WSGL), rather than
the original "lsmini", which exists in a kirkwood version too.

Signed-off-by Benjamin Cama <[email protected]>
Quoted 7 lines
Quoted 5 lines

Hi Benjamin

It would be normal to add the various Acked-by: here, both Alexey and mine. It is not an issue, Gregory can add them, when he adds is own. I'm just mentioning it for any future patches you might submit.

Ah, OK, I was not sure and didn't want to add them by mistake.

applied on mvebu/dt with the Acked-by: flags but also with some minor fixes :I used tab instead of space to indent dts at line 185 and I also resolved the merge conflict with patch "ARM: dts: orion5x: add buffalo linkstation ls-wtgl" in the file arch/arm/boot/dts/Makefile.

Thanks,

Gregory

Quoted 12 lines
Quoted 2 lines

Thanks for the good work converting this,

Thanks!
--
benjamin

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
author
#4 lore raw

PATCH v3 1/1 ARM: dts: Convert Linkstation Mini to Device Tree

Hi Gr?gory,

Le jeudi 06 ao?t 2015 ? 19:00 +0200, Gregory CLEMENT a ?crit :

Quoted 22 lines · Benjamin Cama
Quoted 21 lines

Hi Andrew,

Le jeudi 06 ao?t 2015 ? 18:34 +0200, Andrew Lunn a ?crit :

Quoted 17 lines · Benjamin Cama
Quoted 8 lines

The title says it all. The name of the dts file as been changed to
better reflect the manufacturer's device name (LS-WSGL), rather

than
the original "lsmini", which exists in a kirkwood version too.

Signed-off-by Benjamin Cama <[email protected]>

Hi Benjamin

It would be normal to add the various Acked-by: here, both Alexey and
mine. It is not an issue, Gregory can add them, when he adds is own.
I'm just mentioning it for any future patches you might submit.

Quoted 4 lines
Quoted 1 line

Ah, OK, I was not sure and didn't want to add them by mistake.

applied on mvebu/dt with the Acked-by: flags but also with some minor fixes :I used tab instead of space to indent dts at line 185

Sorry, missed that.

Quoted 3 lines

and I
also resolved the merge conflict with patch "ARM: dts: orion5x: add buffalo linkstation ls-wtgl" in the file arch/arm/boot/dts/Makefile.

Thanks, I didn't rebase on master for some time?

Thanks again for your time,
--
benjamin

#5 lore raw

PATCH v3 1/1 ARM: dts: Convert Linkstation Mini to Device Tree

Hi Benjamin,

Quoted 25 lines · Benjamin Cama

Hi Gr?gory,

Le jeudi 06 ao?t 2015 ? 19:00 +0200, Gregory CLEMENT a ?crit :

Quoted 22 lines · Benjamin Cama
Quoted 21 lines

Hi Andrew,

Le jeudi 06 ao?t 2015 ? 18:34 +0200, Andrew Lunn a ?crit :

Quoted 17 lines · Benjamin Cama
Quoted 8 lines

The title says it all. The name of the dts file as been changed to
better reflect the manufacturer's device name (LS-WSGL), rather

than
the original "lsmini", which exists in a kirkwood version too.

Signed-off-by Benjamin Cama <[email protected]>

Hi Benjamin

It would be normal to add the various Acked-by: here, both Alexey and
mine. It is not an issue, Gregory can add them, when he adds is own.
I'm just mentioning it for any future patches you might submit.

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

Ah, OK, I was not sure and didn't want to add them by mistake.

applied on mvebu/dt with the Acked-by: flags but also with some minor fixes :I used tab instead of space to indent dts at line 185

Sorry, missed that.

No problem it was very minor, actually I didn't find myself, checpatch did it for me :)

Quoted 6 lines
Quoted 4 lines

and I
also resolved the merge conflict with patch "ARM: dts: orion5x: add buffalo linkstation ls-wtgl" in the file arch/arm/boot/dts/Makefile.

Thanks, I didn't rebase on master for some time?

For this one you could not have do better, because the conflict comes from a commit in my mvebu/dt branch and when you send a patch we expect that it is based on the rc1. So it was really my job to do this.

Quoted 2 lines

Thanks again for your time,

You're welcome and thanks for your contributions,

Gregory

Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com