Skip to content

Commit f1ef5b7

Browse files
fifteenhexolofj
authored andcommitted
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>
1 parent 0434460 commit f1ef5b7

11 files changed

Lines changed: 4 additions & 6 deletions

MAINTAINERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2152,9 +2152,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
21522152
S: Maintained
21532153
W: http://linux-chenxing.org/
21542154
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-*
21582156
F: arch/arm/mach-mstar/
21592157

21602158
ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT

arch/arm/boot/dts/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,9 +1371,9 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
13711371
mt8135-evbp1.dtb
13721372
dtb-$(CONFIG_ARCH_MILBEAUT) += milbeaut-m10v-evb.dtb
13731373
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
13771377
dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb
13781378
dtb-$(CONFIG_ARCH_ASPEED) += \
13791379
aspeed-ast2500-evb.dtb \

arch/arm/boot/dts/infinity-msc313-breadbee_crust.dts renamed to arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)