arm64: dts: rockchip: Fix compatible for Radxa CM3
Subsystems (2)
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.
Module 3")
Compute Module 3")
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
@@ -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
@@ -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
@@ -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
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.
---
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
@@ -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
PATCH v2 3/4 arm64: dts: rockchip: Drop unneeded model for Radxa CM3i
In reply to Jagan TekiWith 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
@@ -6,7 +6,6 @@ #include "rk3568.dtsi" / { - model = "Radxa CM3 Industrial Board"; compatible = "radxa,cm3i", "rockchip,rk3568"; aliases {
Signature · 1 line
2.25.1
PATCH v2 4/4 arm64: dts: rockchip: Correct the model name for Radxa E25
In reply to Jagan TekiRadxa E25 is a Carrier board, so update the model name for Radxa E25 as suggested by the Radxa website.
---
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
@@ -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
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 ComputeModule 3")
Fixes 7469ab529bca ("arm64: dts: rockchip: Add rk3566 based RadxaCompute Module 3")
Fixes 096ebfb74b19 ("arm64: dts: rockchip: Add Radxa Compute Module3 IO board")
Suggested-by Krzysztof Kozlowski <[email protected]>Signed-off-by Jagan Teki <[email protected]>
Don't wrap the tags.
Best regards,
Krzysztof
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: ef9134d9bbce071c9e4ebdcbb6f8fb1a5dd0a67eBest regards,
Signature · 1 line
Heiko Stuebner <[email protected]>