[PATCH v2 4/5] ARM: mstar: Add mstar prefix to all of the dtsi/dts files

[Daniel Palmer]

Based on Arnd's comment[0] all of the MStar dtsi/dts files should
have had a prefix.

This moves the files, fixes the Makefile that generates dtbs and
fixes up the MAINTAINERS entry.

Fixing up some includes in the files themselves is left for a later
commit as rolling it into this commit resulted in a confusing diff.

0 - https://lore.kernel.org/linux-arm-kernel/CAK8P3a0maQhfaerwG4KgFZOrUPwueKOp2+MOeG9C=+8ZNzc2Kg@mail.gmail.com/

Signed-off-by: Daniel Palmer <daniel at 0x0f.com>
---
 MAINTAINERS                                                 | 4 +---
 arch/arm/boot/dts/Makefile                                  | 6 +++---
 ...e_crust.dts => mstar-infinity-msc313-breadbee_crust.dts} | 0
 .../{infinity-msc313.dtsi => mstar-infinity-msc313.dtsi}    | 0
 arch/arm/boot/dts/{infinity.dtsi => mstar-infinity.dtsi}    | 0
 ...3e-breadbee.dts => mstar-infinity3-msc313e-breadbee.dts} | 0
 ...{infinity3-msc313e.dtsi => mstar-infinity3-msc313e.dtsi} | 0
 arch/arm/boot/dts/{infinity3.dtsi => mstar-infinity3.dtsi}  | 0
 ...idrived08.dts => mstar-mercury5-ssc8336n-midrived08.dts} | 0
 ...{mercury5-ssc8336n.dtsi => mstar-mercury5-ssc8336n.dtsi} | 0
 arch/arm/boot/dts/{mercury5.dtsi => mstar-mercury5.dtsi}    | 0
 11 files changed, 4 insertions(+), 6 deletions(-)
 rename arch/arm/boot/dts/{infinity-msc313-breadbee_crust.dts => mstar-infinity-msc313-breadbee_crust.dts} (100%)
 rename arch/arm/boot/dts/{infinity-msc313.dtsi => mstar-infinity-msc313.dtsi} (100%)
 rename arch/arm/boot/dts/{infinity.dtsi => mstar-infinity.dtsi} (100%)
 rename arch/arm/boot/dts/{infinity3-msc313e-breadbee.dts => mstar-infinity3-msc313e-breadbee.dts} (100%)
 rename arch/arm/boot/dts/{infinity3-msc313e.dtsi => mstar-infinity3-msc313e.dtsi} (100%)
 rename arch/arm/boot/dts/{infinity3.dtsi => mstar-infinity3.dtsi} (100%)
 rename arch/arm/boot/dts/{mercury5-ssc8336n-midrived08.dts => mstar-mercury5-ssc8336n-midrived08.dts} (100%)
 rename arch/arm/boot/dts/{mercury5-ssc8336n.dtsi => mstar-mercury5-ssc8336n.dtsi} (100%)
 rename arch/arm/boot/dts/{mercury5.dtsi => mstar-mercury5.dtsi} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 45ec9df85a64..89cf1e4cffb0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2150,9 +2150,7 @@ L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
 W:	http://linux-chenxing.org/
 F:	Documentation/devicetree/bindings/arm/mstar/*
-F:	arch/arm/boot/dts/infinity*.dtsi
-F:	arch/arm/boot/dts/mercury*.dtsi
-F:	arch/arm/boot/dts/mstar-v7.dtsi
+F:	arch/arm/boot/dts/mstar-*
 F:	arch/arm/mach-mstar/
 
 ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 4572db3fa5ae..d80d20e6ce9e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1356,9 +1356,9 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
 	mt8135-evbp1.dtb
 dtb-$(CONFIG_ARCH_MILBEAUT) += milbeaut-m10v-evb.dtb
 dtb-$(CONFIG_ARCH_MSTARV7) += \
-	infinity-msc313-breadbee_crust.dtb \
-	infinity3-msc313e-breadbee.dtb \
-	mercury5-ssc8336n-midrived08.dtb
+	mstar-infinity-msc313-breadbee_crust.dtb \
+	mstar-infinity3-msc313e-breadbee.dtb \
+	mstar-mercury5-ssc8336n-midrived08.dtb
 dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb
 dtb-$(CONFIG_ARCH_ASPEED) += \
 	aspeed-ast2500-evb.dtb \
diff --git a/arch/arm/boot/dts/infinity-msc313-breadbee_crust.dts b/arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts
similarity index 100%
rename from arch/arm/boot/dts/infinity-msc313-breadbee_crust.dts
rename to arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts
diff --git a/arch/arm/boot/dts/infinity-msc313.dtsi b/arch/arm/boot/dts/mstar-infinity-msc313.dtsi
similarity index 100%
rename from arch/arm/boot/dts/infinity-msc313.dtsi
rename to arch/arm/boot/dts/mstar-infinity-msc313.dtsi
diff --git a/arch/arm/boot/dts/infinity.dtsi b/arch/arm/boot/dts/mstar-infinity.dtsi
similarity index 100%
rename from arch/arm/boot/dts/infinity.dtsi
rename to arch/arm/boot/dts/mstar-infinity.dtsi
diff --git a/arch/arm/boot/dts/infinity3-msc313e-breadbee.dts b/arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts
similarity index 100%
rename from arch/arm/boot/dts/infinity3-msc313e-breadbee.dts
rename to arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts
diff --git a/arch/arm/boot/dts/infinity3-msc313e.dtsi b/arch/arm/boot/dts/mstar-infinity3-msc313e.dtsi
similarity index 100%
rename from arch/arm/boot/dts/infinity3-msc313e.dtsi
rename to arch/arm/boot/dts/mstar-infinity3-msc313e.dtsi
diff --git a/arch/arm/boot/dts/infinity3.dtsi b/arch/arm/boot/dts/mstar-infinity3.dtsi
similarity index 100%
rename from arch/arm/boot/dts/infinity3.dtsi
rename to arch/arm/boot/dts/mstar-infinity3.dtsi
diff --git a/arch/arm/boot/dts/mercury5-ssc8336n-midrived08.dts b/arch/arm/boot/dts/mstar-mercury5-ssc8336n-midrived08.dts
similarity index 100%
rename from arch/arm/boot/dts/mercury5-ssc8336n-midrived08.dts
rename to arch/arm/boot/dts/mstar-mercury5-ssc8336n-midrived08.dts
diff --git a/arch/arm/boot/dts/mercury5-ssc8336n.dtsi b/arch/arm/boot/dts/mstar-mercury5-ssc8336n.dtsi
similarity index 100%
rename from arch/arm/boot/dts/mercury5-ssc8336n.dtsi
rename to arch/arm/boot/dts/mstar-mercury5-ssc8336n.dtsi
diff --git a/arch/arm/boot/dts/mercury5.dtsi b/arch/arm/boot/dts/mstar-mercury5.dtsi
similarity index 100%
rename from arch/arm/boot/dts/mercury5.dtsi
rename to arch/arm/boot/dts/mstar-mercury5.dtsi
-- 
2.27.0