Skip to contentSkip to conversation

ARM: dts: rename oxnas dts files

PATCH New Daniel Golle 3 participants 3 messages Jan 13, 2018 – Jan 15, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ARM: dts: rename oxnas dts files

Other platforms' device-tree files start with a platform prefix, such as sun7i-a20-*.dts or at91-*.dts.
This naming scheme turns out to be handy when using multi-platform build systems such as OpenWrt.
Prepend oxnas files with their platform prefix to comply with the naming scheme already used for most other platforms.

---
v2: also apply changes in Makefile

 arch/arm/boot/dts/Makefile                                            | 4 ++--
 arch/arm/boot/dts/{wd-mbwe.dts => ox810se-wd-mbwe.dts}                | 0
 ...pogoplug-series-3.dts => ox820-cloudengines-pogoplug-series-3.dts} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/arm/boot/dts/{wd-mbwe.dts => ox810se-wd-mbwe.dts} (100%)
 rename arch/arm/boot/dts/{cloudengines-pogoplug-series-3.dts => ox820-cloudengines-pogoplug-series-3.dts} (100%)
arch/arm/boot/dts/Makefile +2 -2
index d0381e9caf21..6a014afa0ee5 100644
@@ -711,8 +711,8 @@ dtb-$(CONFIG_ARCH_ACTIONS) += \
 dtb-$(CONFIG_ARCH_PRIMA2) += \
 	prima2-evb.dtb
 dtb-$(CONFIG_ARCH_OXNAS) += \
-	wd-mbwe.dtb \
-	cloudengines-pogoplug-series-3.dtb
+	ox810se-wd-mbwe.dtb \
+	ox820-cloudengines-pogoplug-series-3.dtb
 dtb-$(CONFIG_ARCH_QCOM) += \
 	qcom-apq8060-dragonboard.dtb \
 	qcom-apq8064-arrow-sd-600eval.dtb \
arch/arm/boot/dts/ox810se-wd-mbwe.dts renamed from arch/arm/boot/dts/wd-mbwe.dts +0 -0
similarity index 100%
rename from arch/arm/boot/dts/wd-mbwe.dts
rename to arch/arm/boot/dts/ox810se-wd-mbwe.dts
arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts renamed from arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts +0 -0
similarity index 100%
rename from arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
rename to arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
Signature · 1 line
2.15.1
maintainer
#1 lore raw

PATCH v2 1/1 ARM: dts: rename oxnas dts files

Quoted 8 lines · Daniel Golle

Other platforms' device-tree files start with a platform prefix, such as sun7i-a20-*.dts or at91-*.dts.
This naming scheme turns out to be handy when using multi-platform build systems such as OpenWrt.
Prepend oxnas files with their platform prefix to comply with the naming scheme already used for most other platforms.

There are few changes to oxnas in general, and Neil doesn't appear to be around to ask at the moment.
I assume he doesn't mind me picking it up into next/dt directly.

Merged now, thanks,

Arnd

#2 lore raw

PATCH v2 1/1 ARM: dts: rename oxnas dts files

Quoted 10 lines · Arnd Bergmann
Quoted 8 lines · Daniel Golle

Other platforms' device-tree files start with a platform prefix, such as sun7i-a20-*.dts or at91-*.dts.
This naming scheme turns out to be handy when using multi-platform build systems such as OpenWrt.
Prepend oxnas files with their platform prefix to comply with the naming scheme already used for most other platforms.

Quoted 8 lines

There are few changes to oxnas in general, and Neil doesn't appear to be around to ask at the moment.
I assume he doesn't mind me picking it up into next/dt directly.

Merged now, thanks,

Arnd

Hi Daniel,

Thanks for pushing this change, these a low-priority supported devices, OK to rename them.

(I must no forget to changes my test scripts, or I will get a huge headache)

Arnd, thanks for taking this directly.

Neil