Skip to contentSkip to conversation

arm64: dts: rockchip: Fix compatible for Radxa CM3

PATCH Applied Jagan Teki 3 participants 6 messages Jan 23, 2023 – Jan 29, 2023

Subsystems (2)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH v2 1/4 arm64: dts: rockchip: Fix compatible for Radxa CM3

The compatible string "radxa,radxa-cm3" referring the product name as "Radxa Radxa CM3" but the actual product name is "Radxa CM3".

Fix the compatible strings.

Fixes 24a28d3eb07d ("dt-bindings: arm: rockchip: Add Radxa Compute

Module 3")

Fixes 7469ab529bca ("arm64: dts: rockchip: Add rk3566 based Radxa

Compute Module 3")

Fixes 096ebfb74b19 ("arm64: dts: rockchip: Add Radxa Compute Module

3 IO board")

---
Changes for v2:
- new patch

 Documentation/devicetree/bindings/arm/rockchip.yaml  | 4 ++--
 arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts | 2 +-
 arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/arm/rockchip.yaml +2 -2
index 98afd7c6b8e6..35f74eda30ae 100644
@@ -624,8 +624,8 @@ properties:
       - description: Radxa Compute Module 3(CM3)
         items:
           - enum:
-              - radxa,radxa-cm3-io
-          - const: radxa,radxa-cm3
+              - radxa,cm3-io
+          - const: radxa,cm3
           - const: rockchip,rk3566
 
       - description: Radxa CM3 Industrial
arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts +1 -1
index 3e6578f27ec0..4f8ac9fbbf7c 100644
@@ -11,7 +11,7 @@
 
 / {
 	model = "Radxa Compute Module 3(CM3) IO Board";
-	compatible = "radxa,radxa-cm3-io", "radxa,radxa-cm3", "rockchip,rk3566";
+	compatible = "radxa,cm3-io", "radxa,cm3", "rockchip,rk3566";
 
 	aliases {
 		mmc1 = &sdmmc0;
arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi +1 -1
index 23a85a13311a..0bc747997c14 100644
@@ -8,7 +8,7 @@
 #include <dt-bindings/leds/common.h>
 
 / {
-	compatible = "radxa,radxa-cm3", "rockchip,rk3566";
+	compatible = "radxa,cm3", "rockchip,rk3566";
 
 	aliases {
 		mmc0 = &sdhci;
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH v2 2/4 arm64: dts: rockchip: Add missing CM3i fallback compatible for Radxa E25

In order to function the Radxa E25 Carrier board, it is mandatory to mount the Radxa CM3i module.

Add Radxa CM3i compatible as fallback compatible to string to satisfy the Module and Carrier board topology.

Fixes 2bf2f4d9f673 ("arm64: dts: rockchip: Add Radxa CM3I E25")
Cc Chukun Pan <[email protected]>

---
Changes for v2:
- none

 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +1 -1
index 0372dd97c392..9fc9459505bd 100644
@@ -5,7 +5,7 @@
 
 / {
 	model = "Radxa E25";
-	compatible = "radxa,e25", "rockchip,rk3568";
+	compatible = "radxa,e25", "radxa,cm3i", "rockchip,rk3568";
 
 	aliases {
 		mmc1 = &sdmmc0;
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH v2 3/4 arm64: dts: rockchip: Drop unneeded model for Radxa CM3i

In reply to Jagan Teki

With module and carrier board topology, carrier board dts will include module dtsi files for creating complete platform.

The carrier board dts will have final model name and compatible string so any model name added in module dtsi will eventually replaced.

This happened for any devicetree property if the same property is updated or added twice.

So, drop this unneeded model name from module dtsi.

---
Changes for v2:
- none

 arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +0 -1
index 225dbbe4955d..c50fbdd48680 100644
@@ -6,7 +6,6 @@
 #include "rk3568.dtsi"
 
 / {
-	model = "Radxa CM3 Industrial Board";
 	compatible = "radxa,cm3i", "rockchip,rk3568";
 
 	aliases {
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH v2 4/4 arm64: dts: rockchip: Correct the model name for Radxa E25

In reply to Jagan Teki

Radxa E25 is a Carrier board, so update the model name for Radxa E25 as suggested by the Radxa website.

Fixes 2bf2f4d9f673 ("arm64: dts: rockchip: Add Radxa CM3I E25")
Cc Chukun Pan <[email protected]>

---
Changes for v2:
- update commit message add Fixes tag

 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +1 -1
index 9fc9459505bd..63c4bd873188 100644
@@ -4,7 +4,7 @@
 #include "rk3568-radxa-cm3i.dtsi"
 
 / {
-	model = "Radxa E25";
+	model = "Radxa E25 Carrier Board";
 	compatible = "radxa,e25", "radxa,cm3i", "rockchip,rk3568";
 
 	aliases {
Signature · 1 line
2.25.1
Acked-by on v2 1/4
#4 lore raw
In reply to Jagan Teki
Quoted 5 lines · Jagan Teki

The compatible string "radxa,radxa-cm3" referring the product name as "Radxa Radxa CM3" but the actual product name is "Radxa CM3".

Fix the compatible strings.

Quoted 8 lines
Fixes 24a28d3eb07d ("dt-bindings: arm: rockchip: Add Radxa Compute

Module 3")

Fixes 7469ab529bca ("arm64: dts: rockchip: Add rk3566 based Radxa

Compute Module 3")

Fixes 096ebfb74b19 ("arm64: dts: rockchip: Add Radxa Compute Module

3 IO board")

Don't wrap the tags.

Best regards,
Krzysztof

maintainer Applied
#5 lore raw
In reply to Jagan Teki
Quoted 6 lines · Jagan Teki

The compatible string "radxa,radxa-cm3" referring the product name as "Radxa Radxa CM3" but the actual product name is "Radxa CM3".

Fix the compatible strings.

Applied, thanks!

[1/4] arm64: dts: rockchip: Fix compatible for Radxa CM3

      commit: 8f19828844f20b22182719cf53be64f8c955aee8
[2/4] arm64: dts: rockchip: Add missing CM3i fallback compatible for Radxa E25
      commit: c4d2b02d63ee38b381fbc886c02eecfec4f981cc
[3/4] arm64: dts: rockchip: Drop unneeded model for Radxa CM3i
      commit: 421c059d413812444318d27c1b4d6e71f1c1134c
[4/4] arm64: dts: rockchip: Correct the model name for Radxa E25
      commit: ef9134d9bbce071c9e4ebdcbb6f8fb1a5dd0a67e

Best regards,

Signature · 1 line
Heiko Stuebner <[email protected]>