* [PATCH v2 1/4] arm64: dts: rockchip: Fix compatible for Radxa CM3
@ 2023-01-23 7:16 Jagan Teki
2023-01-23 7:16 ` [PATCH v2 2/4] arm64: dts: rockchip: Add missing CM3i fallback compatible for Radxa E25 Jagan Teki
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Jagan Teki @ 2023-01-23 7:16 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Krzysztof Kozlowski
Cc: linux-rockchip, devicetree, linux-arm-kernel, FUKAUMI Naoki,
Jagan Teki, Krzysztof Kozlowski
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")
Suggested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
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(-)
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index 98afd7c6b8e6..35f74eda30ae 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -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
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts
index 3e6578f27ec0..4f8ac9fbbf7c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts
@@ -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;
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
index 23a85a13311a..0bc747997c14 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
@@ -8,7 +8,7 @@
#include <dt-bindings/leds/common.h>
/ {
- compatible = "radxa,radxa-cm3", "rockchip,rk3566";
+ compatible = "radxa,cm3", "rockchip,rk3566";
aliases {
mmc0 = &sdhci;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 2/4] arm64: dts: rockchip: Add missing CM3i fallback compatible for Radxa E25
2023-01-23 7:16 [PATCH v2 1/4] arm64: dts: rockchip: Fix compatible for Radxa CM3 Jagan Teki
@ 2023-01-23 7:16 ` Jagan Teki
2023-01-23 7:16 ` [PATCH v2 3/4] arm64: dts: rockchip: Drop unneeded model for Radxa CM3i Jagan Teki
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jagan Teki @ 2023-01-23 7:16 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Krzysztof Kozlowski
Cc: linux-rockchip, devicetree, linux-arm-kernel, FUKAUMI Naoki,
Jagan Teki, Chukun Pan
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 <amadeus@jmu.edu.cn>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- none
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
index 0372dd97c392..9fc9459505bd 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
@@ -5,7 +5,7 @@
/ {
model = "Radxa E25";
- compatible = "radxa,e25", "rockchip,rk3568";
+ compatible = "radxa,e25", "radxa,cm3i", "rockchip,rk3568";
aliases {
mmc1 = &sdmmc0;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 3/4] arm64: dts: rockchip: Drop unneeded model for Radxa CM3i
2023-01-23 7:16 [PATCH v2 1/4] arm64: dts: rockchip: Fix compatible for Radxa CM3 Jagan Teki
2023-01-23 7:16 ` [PATCH v2 2/4] arm64: dts: rockchip: Add missing CM3i fallback compatible for Radxa E25 Jagan Teki
@ 2023-01-23 7:16 ` Jagan Teki
2023-01-23 7:16 ` [PATCH v2 4/4] arm64: dts: rockchip: Correct the model name for Radxa E25 Jagan Teki
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jagan Teki @ 2023-01-23 7:16 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Krzysztof Kozlowski
Cc: linux-rockchip, devicetree, linux-arm-kernel, FUKAUMI Naoki,
Jagan Teki, Chukun Pan
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.
Cc: Chukun Pan <amadeus@jmu.edu.cn>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- none
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
index 225dbbe4955d..c50fbdd48680 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
@@ -6,7 +6,6 @@
#include "rk3568.dtsi"
/ {
- model = "Radxa CM3 Industrial Board";
compatible = "radxa,cm3i", "rockchip,rk3568";
aliases {
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 4/4] arm64: dts: rockchip: Correct the model name for Radxa E25
2023-01-23 7:16 [PATCH v2 1/4] arm64: dts: rockchip: Fix compatible for Radxa CM3 Jagan Teki
2023-01-23 7:16 ` [PATCH v2 2/4] arm64: dts: rockchip: Add missing CM3i fallback compatible for Radxa E25 Jagan Teki
2023-01-23 7:16 ` [PATCH v2 3/4] arm64: dts: rockchip: Drop unneeded model for Radxa CM3i Jagan Teki
@ 2023-01-23 7:16 ` Jagan Teki
2023-01-23 7:59 ` [PATCH v2 1/4] arm64: dts: rockchip: Fix compatible for Radxa CM3 Krzysztof Kozlowski
2023-01-29 13:39 ` Heiko Stuebner
4 siblings, 0 replies; 6+ messages in thread
From: Jagan Teki @ 2023-01-23 7:16 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Krzysztof Kozlowski
Cc: linux-rockchip, devicetree, linux-arm-kernel, FUKAUMI Naoki,
Jagan Teki, Chukun Pan
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 <amadeus@jmu.edu.cn>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
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(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
index 9fc9459505bd..63c4bd873188 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
@@ -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 {
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/4] arm64: dts: rockchip: Fix compatible for Radxa CM3
2023-01-23 7:16 [PATCH v2 1/4] arm64: dts: rockchip: Fix compatible for Radxa CM3 Jagan Teki
` (2 preceding siblings ...)
2023-01-23 7:16 ` [PATCH v2 4/4] arm64: dts: rockchip: Correct the model name for Radxa E25 Jagan Teki
@ 2023-01-23 7:59 ` Krzysztof Kozlowski
2023-01-29 13:39 ` Heiko Stuebner
4 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2023-01-23 7:59 UTC (permalink / raw)
To: Jagan Teki, Heiko Stuebner, Rob Herring, Krzysztof Kozlowski
Cc: linux-rockchip, devicetree, linux-arm-kernel, FUKAUMI Naoki
On 23/01/2023 08:16, Jagan Teki wrote:
> 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")
> Suggested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Don't wrap the tags.
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/4] arm64: dts: rockchip: Fix compatible for Radxa CM3
2023-01-23 7:16 [PATCH v2 1/4] arm64: dts: rockchip: Fix compatible for Radxa CM3 Jagan Teki
` (3 preceding siblings ...)
2023-01-23 7:59 ` [PATCH v2 1/4] arm64: dts: rockchip: Fix compatible for Radxa CM3 Krzysztof Kozlowski
@ 2023-01-29 13:39 ` Heiko Stuebner
4 siblings, 0 replies; 6+ messages in thread
From: Heiko Stuebner @ 2023-01-29 13:39 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Jagan Teki
Cc: Heiko Stuebner, linux-rockchip, FUKAUMI Naoki,
Krzysztof Kozlowski, linux-arm-kernel, devicetree
On Mon, 23 Jan 2023 12:46:50 +0530, Jagan Teki wrote:
> 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,
--
Heiko Stuebner <heiko@sntech.de>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-29 13:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-23 7:16 [PATCH v2 1/4] arm64: dts: rockchip: Fix compatible for Radxa CM3 Jagan Teki
2023-01-23 7:16 ` [PATCH v2 2/4] arm64: dts: rockchip: Add missing CM3i fallback compatible for Radxa E25 Jagan Teki
2023-01-23 7:16 ` [PATCH v2 3/4] arm64: dts: rockchip: Drop unneeded model for Radxa CM3i Jagan Teki
2023-01-23 7:16 ` [PATCH v2 4/4] arm64: dts: rockchip: Correct the model name for Radxa E25 Jagan Teki
2023-01-23 7:59 ` [PATCH v2 1/4] arm64: dts: rockchip: Fix compatible for Radxa CM3 Krzysztof Kozlowski
2023-01-29 13:39 ` Heiko Stuebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).