Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <daniel@0x0f.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

authored by

Daniel Palmer and committed by
Olof Johansson
f1ef5b78 04344604

+4 -6
+1 -3
MAINTAINERS
··· 2152 2152 S: Maintained 2153 2153 W: http://linux-chenxing.org/ 2154 2154 F: Documentation/devicetree/bindings/arm/mstar/* 2155 - F: arch/arm/boot/dts/infinity*.dtsi 2156 - F: arch/arm/boot/dts/mercury*.dtsi 2157 - F: arch/arm/boot/dts/mstar-v7.dtsi 2155 + F: arch/arm/boot/dts/mstar-* 2158 2156 F: arch/arm/mach-mstar/ 2159 2157 2160 2158 ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
+3 -3
arch/arm/boot/dts/Makefile
··· 1371 1371 mt8135-evbp1.dtb 1372 1372 dtb-$(CONFIG_ARCH_MILBEAUT) += milbeaut-m10v-evb.dtb 1373 1373 dtb-$(CONFIG_ARCH_MSTARV7) += \ 1374 - infinity-msc313-breadbee_crust.dtb \ 1375 - infinity3-msc313e-breadbee.dtb \ 1376 - mercury5-ssc8336n-midrived08.dtb 1374 + mstar-infinity-msc313-breadbee_crust.dtb \ 1375 + mstar-infinity3-msc313e-breadbee.dtb \ 1376 + mstar-mercury5-ssc8336n-midrived08.dtb 1377 1377 dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb 1378 1378 dtb-$(CONFIG_ARCH_ASPEED) += \ 1379 1379 aspeed-ast2500-evb.dtb \
arch/arm/boot/dts/infinity-msc313-breadbee_crust.dts arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts
arch/arm/boot/dts/infinity-msc313.dtsi arch/arm/boot/dts/mstar-infinity-msc313.dtsi
arch/arm/boot/dts/infinity.dtsi arch/arm/boot/dts/mstar-infinity.dtsi
arch/arm/boot/dts/infinity3-msc313e-breadbee.dts arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts
arch/arm/boot/dts/infinity3-msc313e.dtsi arch/arm/boot/dts/mstar-infinity3-msc313e.dtsi
arch/arm/boot/dts/infinity3.dtsi arch/arm/boot/dts/mstar-infinity3.dtsi
arch/arm/boot/dts/mercury5-ssc8336n-midrived08.dts arch/arm/boot/dts/mstar-mercury5-ssc8336n-midrived08.dts
arch/arm/boot/dts/mercury5-ssc8336n.dtsi arch/arm/boot/dts/mstar-mercury5-ssc8336n.dtsi
arch/arm/boot/dts/mercury5.dtsi arch/arm/boot/dts/mstar-mercury5.dtsi