Skip to contentSkip to conversation

dt-bindings: arm: rockchip: Add meaningful comments for Radxa CM3

PATCH In review Jagan Teki 3 participants 15 messages Jan 17, 2023 – Jan 18, 2023

Subsystems (2)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/7 dt-bindings: arm: rockchip: Add meaningful comments for Radxa CM3

Radxa produced several versions of the RK356x-based Compute modules called Radxa Compute Module 3(CM3) for consumer and industrial use with a variety of form factors.

So, adding meaningful comments on dt-bindings would help to understand more about specific module relevance.

This patch is trying to add comments on existing CM3 bindings and expecting the subsequent modules are following similar comments while adding dt-bindings to it.

---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/arm/rockchip.yaml +3 -3
index 98afd7c6b8e6..3d3c59624483 100644
@@ -621,11 +621,11 @@ properties:
           - const: pine64,soquartz
           - const: rockchip,rk3566
 
-      - description: Radxa Compute Module 3(CM3)
+      - description: Radxa Compute Module 3(CM3) SoM based boards
         items:
           - enum:
-              - radxa,radxa-cm3-io
-          - const: radxa,radxa-cm3
+              - radxa,radxa-cm3-io   # Radxa Compute Module 3(CM3) IO Board
+          - const: radxa,radxa-cm3   # Radxa Compute Module 3(CM3)
           - const: rockchip,rk3566
 
       - description: Radxa CM3 Industrial
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/7 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]>
---
 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 fb96019b0e87..a4c33310ca42 100644
@@ -5,7 +5,7 @@
 
 / {
 	model = "Radxa E25";
-	compatible = "radxa,e25", "rockchip,rk3568";
+	compatible = "radxa,e25", "radxa,cm3i", "rockchip,rk3568";
 
 	aliases {
 		mmc0 = &sdmmc0;
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 3/7 dt-bindings: arm: rockchip: Fix description and compatible for Radxa CM3i

In reply to Jagan Teki

Fix the dt-bindings for Radxa CM3i SoM based boards with proper description and compatible strings recommended by Radxa.

Fixes ae9fbe0b1f96 ("dt-bindings: arm: rockchip: add Radxa CM3I E25")
Cc Chukun Pan <[email protected]>
---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/arm/rockchip.yaml +3 -3
index 3d3c59624483..6f276d787e50 100644
@@ -628,11 +628,11 @@ properties:
           - const: radxa,radxa-cm3   # Radxa Compute Module 3(CM3)
           - const: rockchip,rk3566
 
-      - description: Radxa CM3 Industrial
+      - description: Radxa Compute Module 3 Industrial(CM3i) SoM based boards
         items:
           - enum:
-              - radxa,e25
-          - const: radxa,cm3i
+              - radxa,radxa-e25      # Radxa E25 Carrier Board
+          - const: radxa,radxa-cm3i  # Radxa Compute Module 3 Industrial(CM3i)
           - const: rockchip,rk3568
 
       - description: Radxa Rock
Signature · 1 line
2.25.1
#3 lore raw

Re: [PATCH 3/7] dt-bindings: arm: rockchip: Fix description and compatible for Radxa CM3i

Quoted 17 lines · Jagan Teki

Fix the dt-bindings for Radxa CM3i SoM based boards with proper description and compatible strings recommended by Radxa.

Fixes ae9fbe0b1f96 ("dt-bindings: arm: rockchip: add Radxa CM3I E25")
Cc Chukun Pan <[email protected]>
---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/arm/rockchip.yaml +0 -0
index 3d3c59624483..6f276d787e50 100644
@@ -628,11 +628,11 @@ properties:
           - const: radxa,radxa-cm3   # Radxa Compute Module 3(CM3)

Documentation/devicetree/bindings/arm/rockchip.yaml properties: · line 635

Quoted 10 lines
Documentation/devicetree/bindings/arm/rockchip.yaml +3 -3
           - const: rockchip,rk3566
 
-      - description: Radxa CM3 Industrial
+      - description: Radxa Compute Module 3 Industrial(CM3i) SoM based boards
         items:
           - enum:
-              - radxa,e25
-          - const: radxa,cm3i
+              - radxa,radxa-e25      # Radxa E25 Carrier Board
+          - const: radxa,radxa-cm3i  # Radxa Compute Module 3 Industrial(CM3i)

No, it does not match your patch 2/7. It also does not make sense to duplicate vendor prefix.

Best regards,
Krzysztof

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

author
#4 lore raw

Re: [PATCH 3/7] dt-bindings: arm: rockchip: Fix description and compatible for Radxa CM3i

Quoted 21 lines · Krzysztof Kozlowski
Quoted 19 lines · Jagan Teki

Fix the dt-bindings for Radxa CM3i SoM based boards with proper description and compatible strings recommended by Radxa.

Fixes ae9fbe0b1f96 ("dt-bindings: arm: rockchip: add Radxa CM3I E25")
Cc Chukun Pan <[email protected]>
---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/arm/rockchip.yaml +0 -0
index 3d3c59624483..6f276d787e50 100644
@@ -628,11 +628,11 @@ properties:
           - const: radxa,radxa-cm3   # Radxa Compute Module 3(CM3)
           - const: rockchip,rk3566
 
Quoted 11 lines

Documentation/devicetree/bindings/arm/rockchip.yaml properties: · line 635

Quoted 8 lines
Documentation/devicetree/bindings/arm/rockchip.yaml +3 -3
-      - description: Radxa CM3 Industrial
+      - description: Radxa Compute Module 3 Industrial(CM3i) SoM based boards
         items:
           - enum:
-              - radxa,e25
-          - const: radxa,cm3i
+              - radxa,radxa-e25      # Radxa E25 Carrier Board
+          - const: radxa,radxa-cm3i  # Radxa Compute Module 3 Industrial(CM3i)

No, it does not match your patch 2/7. It also does not make sense to duplicate vendor prefix.

2/7 follows the existing bindings and that one is incorrect as the actual product name is radxa-cm3i not cm3i. This patch is trying to fix that.

Jagan.

maintainer
#5 lore raw

Re: [PATCH 3/7] dt-bindings: arm: rockchip: Fix description and compatible for Radxa CM3i

Quoted 35 lines · Jagan Teki
Quoted 21 lines · Krzysztof Kozlowski
Quoted 19 lines · Jagan Teki

Fix the dt-bindings for Radxa CM3i SoM based boards with proper description and compatible strings recommended by Radxa.

Fixes ae9fbe0b1f96 ("dt-bindings: arm: rockchip: add Radxa CM3I E25")
Cc Chukun Pan <[email protected]>
---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/arm/rockchip.yaml +0 -0
index 3d3c59624483..6f276d787e50 100644
@@ -628,11 +628,11 @@ properties:
           - const: radxa,radxa-cm3   # Radxa Compute Module 3(CM3)
           - const: rockchip,rk3566
 
Quoted 11 lines

Documentation/devicetree/bindings/arm/rockchip.yaml properties: · line 635

Quoted 8 lines
Documentation/devicetree/bindings/arm/rockchip.yaml +3 -3
-      - description: Radxa CM3 Industrial
+      - description: Radxa Compute Module 3 Industrial(CM3i) SoM based boards
         items:
           - enum:
-              - radxa,e25
-          - const: radxa,cm3i
+              - radxa,radxa-e25      # Radxa E25 Carrier Board
+          - const: radxa,radxa-cm3i  # Radxa Compute Module 3 Industrial(CM3i)

No, it does not match your patch 2/7. It also does not make sense to duplicate vendor prefix.

Quoted 3 lines

2/7 follows the existing bindings and that one is incorrect as the actual product name is radxa-cm3i not cm3i. This patch is trying to fix that.

Compatibles are unique (hopefully) identifiers, not 'product names'. Granted, 'e25' is a bit terse, but does Radxa have multiple things which are called 'e25'? If not, then you don't need this change. If the name is problematic in some other way, then state that reason for the patch.

Rob

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

author
#6 lore raw

PATCH 4/7 arm64: dts: rockchip: Fix compatible and model for Radxa CM3i

In reply to Jagan Teki

Fix the model name and compatible strings for Radxa CM3i SoM and Carrier board based on Radxa recommendation.

Fixes 2bf2f4d9f673 ("arm64: dts: rockchip: Add Radxa CM3I E25")
Cc Chukun Pan <[email protected]>
---
 arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 2 +-
 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +1 -1
index 225dbbe4955d..0c9a918b809a 100644
@@ -7,7 +7,7 @@
 
 / {
 	model = "Radxa CM3 Industrial Board";
-	compatible = "radxa,cm3i", "rockchip,rk3568";
+	compatible = "radxa,radxa-cm3i", "rockchip,rk3568";
 
 	aliases {
 		mmc0 = &sdhci;
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +2 -2
index a4c33310ca42..8ca15b723799 100644
@@ -4,8 +4,8 @@
 #include "rk3568-radxa-cm3i.dtsi"
 
 / {
-	model = "Radxa E25";
-	compatible = "radxa,e25", "radxa,cm3i", "rockchip,rk3568";
+	model = "Radxa E25 Carrier Board";
+	compatible = "radxa,radxa-e25", "radxa,radxa-cm3i", "rockchip,rk3568";
 
 	aliases {
 		mmc0 = &sdmmc0;
Signature · 1 line
2.25.1
#7 lore raw

Re: [PATCH 4/7] arm64: dts: rockchip: Fix compatible and model for Radxa CM3i

Quoted 17 lines · Jagan Teki

Fix the model name and compatible strings for Radxa CM3i SoM and Carrier board based on Radxa recommendation.

Fixes 2bf2f4d9f673 ("arm64: dts: rockchip: Add Radxa CM3I E25")
Cc Chukun Pan <[email protected]>
---
 arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 2 +-
 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +0 -0
index 225dbbe4955d..0c9a918b809a 100644

arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi line 10

Quoted 5 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +1 -1
@@ -7,7 +7,7 @@
 
 / {
 	model = "Radxa CM3 Industrial Board";
-	compatible = "radxa,cm3i", "rockchip,rk3568";
+	compatible = "radxa,radxa-cm3i", "rockchip,rk3568";

Nope, second radxa is redundant.

Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +0 -0
 	aliases {
 		mmc0 = &sdhci;
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +0 -0
index a4c33310ca42..8ca15b723799 100644

arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts line 8

Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +2 -2
@@ -4,8 +4,8 @@
 #include "rk3568-radxa-cm3i.dtsi"
 
 / {
-	model = "Radxa E25";
-	compatible = "radxa,e25", "radxa,cm3i", "rockchip,rk3568";
+	model = "Radxa E25 Carrier Board";
+	compatible = "radxa,radxa-e25", "radxa,radxa-cm3i", "rockchip,rk3568";

NAK. You just changed it in patch 2. Don't add broken compatibles in one patch (cm3i) and fix them next one. It's like adding intentional bugs and fixing them immediately...

Best regards,
Krzysztof

author
#8 lore raw

Re: [PATCH 4/7] arm64: dts: rockchip: Fix compatible and model for Radxa CM3i

Quoted 20 lines · Krzysztof Kozlowski
Quoted 18 lines · Jagan Teki

Fix the model name and compatible strings for Radxa CM3i SoM and Carrier board based on Radxa recommendation.

Fixes 2bf2f4d9f673 ("arm64: dts: rockchip: Add Radxa CM3I E25")
Cc Chukun Pan <[email protected]>
---
 arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 2 +-
 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +0 -0
index 225dbbe4955d..0c9a918b809a 100644
@@ -7,7 +7,7 @@
 
Quoted 6 lines

arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi line 10

Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +1 -1
 / {
      model = "Radxa CM3 Industrial Board";
-     compatible = "radxa,cm3i", "rockchip,rk3568";
+     compatible = "radxa,radxa-cm3i", "rockchip,rk3568";

Nope, second radxa is redundant.

It is not redundant, Product name and vendor name is same. Vendor name is Radxa and product name is Radxa CM3i

Quoted 11 lines
Quoted 11 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +0 -0
      aliases {
              mmc0 = &sdhci;
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +0 -0
index a4c33310ca42..8ca15b723799 100644
@@ -4,8 +4,8 @@
 #include "rk3568-radxa-cm3i.dtsi"
 
Quoted 9 lines

arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts line 8

Quoted 5 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +2 -2
 / {
-     model = "Radxa E25";
-     compatible = "radxa,e25", "radxa,cm3i", "rockchip,rk3568";
+     model = "Radxa E25 Carrier Board";
+     compatible = "radxa,radxa-e25", "radxa,radxa-cm3i", "rockchip,rk3568";

NAK. You just changed it in patch 2. Don't add broken compatibles in one patch (cm3i) and fix them next one. It's like adding intentional bugs and fixing them immediately...

I did squash this with previous patch but the check patch showing warning to separate the dt-bindings patch from actual devicetree file change.

Jagan.

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

#9 lore raw

Re: [PATCH 4/7] arm64: dts: rockchip: Fix compatible and model for Radxa CM3i

Quoted 29 lines · Jagan Teki
Quoted 20 lines · Krzysztof Kozlowski
Quoted 18 lines · Jagan Teki

Fix the model name and compatible strings for Radxa CM3i SoM and Carrier board based on Radxa recommendation.

Fixes 2bf2f4d9f673 ("arm64: dts: rockchip: Add Radxa CM3I E25")
Cc Chukun Pan <[email protected]>
---
 arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 2 +-
 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +0 -0
index 225dbbe4955d..0c9a918b809a 100644
@@ -7,7 +7,7 @@
 
Quoted 6 lines

arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi line 10

Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +1 -1
 / {
      model = "Radxa CM3 Industrial Board";
-     compatible = "radxa,cm3i", "rockchip,rk3568";
+     compatible = "radxa,radxa-cm3i", "rockchip,rk3568";

Nope, second radxa is redundant.

Quoted 2 lines

It is not redundant, Product name and vendor name is same. Vendor name is Radxa and product name is Radxa CM3i

If this was true, then on their website the product would be called "Radxa Radxa CM3i", but it is not. It is called Radxa CM3i, to denote the company name with the model name. Anyway, in the name of model you can call it. In the context of compatible it is redundant.

Quoted 22 lines
Quoted 12 lines
Quoted 12 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +0 -0
      aliases {
              mmc0 = &sdhci;
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +0 -0
index a4c33310ca42..8ca15b723799 100644
@@ -4,8 +4,8 @@
 #include "rk3568-radxa-cm3i.dtsi"
 
Quoted 9 lines

arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts line 8

Quoted 5 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +2 -2
 / {
-     model = "Radxa E25";
-     compatible = "radxa,e25", "radxa,cm3i", "rockchip,rk3568";
+     model = "Radxa E25 Carrier Board";
+     compatible = "radxa,radxa-e25", "radxa,radxa-cm3i", "rockchip,rk3568";

NAK. You just changed it in patch 2. Don't add broken compatibles in one patch (cm3i) and fix them next one. It's like adding intentional bugs and fixing them immediately...

Quoted 3 lines

I did squash this with previous patch but the check patch showing warning to separate the dt-bindings patch from actual devicetree file change.

Patch 2 was not a bindings patch, so you squashed wrong files.

Best regards,
Krzysztof

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

author
#10 lore raw

Re: [PATCH 4/7] arm64: dts: rockchip: Fix compatible and model for Radxa CM3i

Quoted 31 lines · Krzysztof Kozlowski
Quoted 29 lines · Jagan Teki
Quoted 26 lines · Krzysztof Kozlowski
Quoted 17 lines · Jagan Teki

Fix the model name and compatible strings for Radxa CM3i SoM and Carrier board based on Radxa recommendation.

Fixes 2bf2f4d9f673 ("arm64: dts: rockchip: Add Radxa CM3I E25")
Cc Chukun Pan <[email protected]>
---
 arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 2 +-
 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +0 -0
index 225dbbe4955d..0c9a918b809a 100644

arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi line 10

Quoted 5 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +1 -1
@@ -7,7 +7,7 @@
 
 / {
      model = "Radxa CM3 Industrial Board";
-     compatible = "radxa,cm3i", "rockchip,rk3568";
+     compatible = "radxa,radxa-cm3i", "rockchip,rk3568";

Nope, second radxa is redundant.

Quoted 7 lines
Quoted 2 lines

It is not redundant, Product name and vendor name is same. Vendor name is Radxa and product name is Radxa CM3i

If this was true, then on their website the product would be called "Radxa Radxa CM3i", but it is not. It is called Radxa CM3i, to denote the company name with the model name. Anyway, in the name of model you can call it. In the context of compatible it is redundant.

Is it mandatory to consider the manufacturer as well in order to denote the model name of the product?

This I what I thought, correct me if I'm wrong. The recommended compatible format is "manufacturer,model" so we can consider only the model in compatible string in order to denote the model name, not the manufacturer. So with "radxa,radxa-cm3i" compatible the desired model would be "Radxa CM3i"

Quoted 23 lines
Quoted 23 lines
Quoted 22 lines
Quoted 11 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +0 -0
      aliases {
              mmc0 = &sdhci;
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +0 -0
index a4c33310ca42..8ca15b723799 100644

arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts line 8

Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +2 -2
@@ -4,8 +4,8 @@
 #include "rk3568-radxa-cm3i.dtsi"
 
 / {
-     model = "Radxa E25";
-     compatible = "radxa,e25", "radxa,cm3i", "rockchip,rk3568";
+     model = "Radxa E25 Carrier Board";
+     compatible = "radxa,radxa-e25", "radxa,radxa-cm3i", "rockchip,rk3568";

NAK. You just changed it in patch 2. Don't add broken compatibles in one patch (cm3i) and fix them next one. It's like adding intentional bugs and fixing them immediately...

Quoted 5 lines
Quoted 3 lines

I did squash this with previous patch but the check patch showing warning to separate the dt-bindings patch from actual devicetree file change.

Patch 2 was not a bindings patch, so you squashed wrong files.

I mean 3/7 patch - "[PATCH 3/7] dt-bindings: arm: rockchip: Fix description and compatible for Radxa CM3i"

Jagan.

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

author
#11 lore raw

PATCH 5/7 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.

---
 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 0c9a918b809a..1bada98a4d8b 100644
@@ -6,7 +6,6 @@
 #include "rk3568.dtsi"
 
 / {
-	model = "Radxa CM3 Industrial Board";
 	compatible = "radxa,radxa-cm3i", "rockchip,rk3568";
 
 	aliases {
Signature · 1 line
2.25.1
author
#12 lore raw

PATCH 6/7 arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SoM boards

In reply to Jagan Teki

Radxa has produced Compute Modules like RK3399pro VMARC and CM3i with onboarding eMMC flash, so the eMMC is the primary MMC device.

On the other hand, Rockchip boot orders start from eMMC from an MMC device perspective.

Mark, the eMMC has mmc0 to satisfy the above two conditions.

---
 arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 4 ++--
 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi +2 -2
index bf9eb0405b62..8b8992a8e9c0 100644
@@ -13,8 +13,8 @@ / {
 	compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
 
 	aliases {
-		mmc0 = &sdmmc;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 	};
 
 	vcc3v3_pcie: vcc-pcie-regulator {
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +1 -2
index 8ca15b723799..6a3d964f6207 100644
@@ -8,8 +8,7 @@ / {
 	compatible = "radxa,radxa-e25", "radxa,radxa-cm3i", "rockchip,rk3568";
 
 	aliases {
-		mmc0 = &sdmmc0;
-		mmc1 = &sdhci;
+		mmc1 = &sdmmc0;
 	};
 
 	pwm-leds {
Signature · 1 line
2.25.1
author
#13 lore raw

PATCH 7/7 arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SBC boards

In reply to Jagan Teki

Radxa SBC boards like ROCK 3A/4 models do support eMMC and SDcard via external connector slots.

Mark, the eMMC has mmc0 by considering the Rockchip boot order priority as both MMC devices are connected externally.

---
 arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts | 4 ++--
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi   | 4 ++--
 arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts +2 -2
index 309c35d7fca8..028eb508ae30 100644
@@ -15,8 +15,8 @@ / {
 	compatible = "radxa,rock-4c-plus", "rockchip,rk3399";
 
 	aliases {
-		mmc0 = &sdmmc;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 	};
 
 	chosen {
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +2 -2
index 1f76d3501bda..907071d4fe80 100644
@@ -13,8 +13,8 @@
 
 / {
 	aliases {
-		mmc0 = &sdmmc;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 	};
 
 	chosen {
arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +2 -2
index cd1e1d8e1244..77ba37ce6d6c 100644
@@ -13,8 +13,8 @@ / {
 
 	aliases {
 		ethernet0 = &gmac1;
-		mmc0 = &sdmmc0;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc0;
 	};
 
 	chosen: chosen {
Signature · 1 line
2.25.1
Acked-by on v1 1/7
#14 lore raw
In reply to Jagan Teki
Quoted 10 lines · Jagan Teki

Radxa produced several versions of the RK356x-based Compute modules called Radxa Compute Module 3(CM3) for consumer and industrial use with a variety of form factors.

So, adding meaningful comments on dt-bindings would help to understand more about specific module relevance.

This patch is trying to add comments on existing CM3 bindings and expecting the subsequent modules are following similar comments while adding dt-bindings to it.

Best regards,
Krzysztof

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip