ARM: dts: stm32: phycore-stm32mp15: Rename device tree files

Rename "stm32mp157c-phycore-*" device tree for the following reasons:

- The name of the dts should match to the phyBOARD name and not the name
of the SoM ("phycore-stm32mp1-3" was initialy coming from the name of
the yocto machine from meta-phytec).
- PHYTEC manages different SoM configurations with different STM32MP15x
SoC versions, so common dtsi files starting with "stm32mp15xx-*" should
be used (as it is done for ST boards for example).
- Add "-rdk" as suffix (for "Rapid Development Kit") to match our others
phytec boards dts names (imx6, imx6ul,..).
- "model" property is updated to introduce the name "phyBOARD-Sargas".

Signed-off-by: Christophe Parant <c.parant@phytec.fr>
Link: https://lore.kernel.org/r/20251210101611.27008-2-c.parant@phytec.fr
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>

diff --git a/arch/arm/boot/dts/st/Makefile b/arch/arm/boot/dts/st/Makefile
index e906bf6ba004147216a39bbde382d123a805c6c2..8e0aee7497f04f0138ade387d387aa15f15f714a 100644 (file)
--- a/arch/arm/boot/dts/st/Makefile
+++ b/arch/arm/boot/dts/st/Makefile
@@ -69,7 +69,7 @@ dtb-$(CONFIG_ARCH_STM32) += \
        stm32mp157c-lxa-tac-gen2.dtb \
        stm32mp157c-odyssey.dtb \
        stm32mp157c-osd32mp1-red.dtb \
-       stm32mp157c-phycore-stm32mp1-3.dtb \
+       stm32mp157c-phyboard-sargas-rdk.dtb \
        stm32mp157c-ultra-fly-sbc.dtb \
        stm32mp157f-dk2.dtb
 dtb-$(CONFIG_ARCH_U8500) += \

diff --git a/arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp1-3.dts b/arch/arm/boot/dts/st/stm32mp157c-phyboard-sargas-rdk.dts
similarity index 89%
rename from arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp1-3.dts
rename to arch/arm/boot/dts/st/stm32mp157c-phyboard-sargas-rdk.dts
index 28d7203264cea5cbaa3d1594eabe113eab65607e..26995eb2a6190c85eb0fe687bca6289314afcab4 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp1-3.dts
+++ b/arch/arm/boot/dts/st/stm32mp157c-phyboard-sargas-rdk.dts
@@ -10,10 +10,10 @@
 #include "stm32mp157.dtsi"
 #include "stm32mp15xc.dtsi"
 #include "stm32mp15xxac-pinctrl.dtsi"
-#include "stm32mp157c-phycore-stm32mp15-som.dtsi"
+#include "stm32mp15xx-phyboard-sargas.dtsi"
 
 / {
-       model = "PHYTEC phyCORE-STM32MP1-3 Dev Board";
+       model = "PHYTEC phyBOARD-Sargas STM32MP157C";
        compatible = "phytec,phycore-stm32mp1-3",
                     "phytec,phycore-stm32mp157c-som", "st,stm32mp157";
 

diff --git a/arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-phyboard-sargas.dtsi
similarity index 99%
rename from arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi
rename to arch/arm/boot/dts/st/stm32mp15xx-phyboard-sargas.dtsi
index 370b2afbf15bf033574fb773da63e5711fb00678..0d87c7254d201d20e4b8469d5a17cf5bb37977d7 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15xx-phyboard-sargas.dtsi
@@ -16,9 +16,6 @@
 #include "stm32mp15-pinctrl.dtsi"
 
 / {
-       model = "PHYTEC phyCORE-STM32MP15 SOM";
-       compatible = "phytec,phycore-stm32mp157c-som", "st,stm32mp157";
-
        aliases {
                ethernet0 = &ethernet0;
                rtc0 = &i2c4_rtc;