From: Daniel Palmer Date: Fri, 2 Oct 2020 13:34:17 +0000 (+0900) Subject: ARM: mstar: Add mstar prefix to all of the dtsi/dts files X-Git-Tag: v5.10-rc1~26^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1ef5b78a76224ee741925abad0a4b3af482d57f;p=thirdparty%2Flinux.git ARM: mstar: Add mstar prefix to all of the dtsi/dts files 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/ Link: https://lore.kernel.org/r/20201002133418.2250277-5-daniel@0x0f.com Signed-off-by: Daniel Palmer Signed-off-by: Olof Johansson --- diff --git a/MAINTAINERS b/MAINTAINERS index 86bfe24214835..b5de0502d94c7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2152,9 +2152,7 @@ L: linux-arm-kernel@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 a457dca8af407..ce66ffd5a1bbc 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1371,9 +1371,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