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

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

[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.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index 98afd7c6b8e6..3d3c59624483 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -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
-- 
2.25.1

[PATCH 2/7] arm64: dts: rockchip: Add missing CM3i fallback compatible for Radxa E25

[Jagan Teki]

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>
---
 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 fb96019b0e87..a4c33310ca42 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 {
 		mmc0 = &sdmmc0;
-- 
2.25.1

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

[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 <amadeus@jmu.edu.cn>
Reported-by: FUKAUMI Naoki <naoki@radxa.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index 3d3c59624483..6f276d787e50 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -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
-- 
2.25.1

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

[Krzysztof Kozlowski]

On 17/01/2023 11:55, Jagan Teki wrote:
> 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 <amadeus@jmu.edu.cn>
> Reported-by: FUKAUMI Naoki <naoki@radxa.com>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
>  Documentation/devicetree/bindings/arm/rockchip.yaml | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
> index 3d3c59624483..6f276d787e50 100644
> --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> @@ -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)

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

Best regards,
Krzysztof

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

[Jagan Teki]

On Tue, Jan 17, 2023 at 4:36 PM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> On 17/01/2023 11:55, Jagan Teki wrote:
> > 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 <amadeus@jmu.edu.cn>
> > Reported-by: FUKAUMI Naoki <naoki@radxa.com>
> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> > ---
> >  Documentation/devicetree/bindings/arm/rockchip.yaml | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > index 3d3c59624483..6f276d787e50 100644
> > --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> > +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > @@ -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)
>
> 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.

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

[Rob Herring]

On Tue, Jan 17, 2023 at 06:25:44PM +0530, Jagan Teki wrote:
> On Tue, Jan 17, 2023 at 4:36 PM Krzysztof Kozlowski
> <krzysztof.kozlowski@linaro.org> wrote:
> >
> > On 17/01/2023 11:55, Jagan Teki wrote:
> > > 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 <amadeus@jmu.edu.cn>
> > > Reported-by: FUKAUMI Naoki <naoki@radxa.com>
> > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> > > ---
> > >  Documentation/devicetree/bindings/arm/rockchip.yaml | 6 +++---
> > >  1 file changed, 3 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > > index 3d3c59624483..6f276d787e50 100644
> > > --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> > > +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > > @@ -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)
> >
> > 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.

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

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

[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 <amadeus@jmu.edu.cn>
Reported-by: FUKAUMI Naoki <naoki@radxa.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 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(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
index 225dbbe4955d..0c9a918b809a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	model = "Radxa CM3 Industrial Board";
-	compatible = "radxa,cm3i", "rockchip,rk3568";
+	compatible = "radxa,radxa-cm3i", "rockchip,rk3568";
 
 	aliases {
 		mmc0 = &sdhci;
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
index a4c33310ca42..8ca15b723799 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
@@ -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;
-- 
2.25.1

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

[Krzysztof Kozlowski]

On 17/01/2023 11:55, Jagan Teki wrote:
> 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 <amadeus@jmu.edu.cn>
> Reported-by: FUKAUMI Naoki <naoki@radxa.com>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
>  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(-)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
> index 225dbbe4955d..0c9a918b809a 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
> @@ -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.

>  
>  	aliases {
>  		mmc0 = &sdhci;
> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
> index a4c33310ca42..8ca15b723799 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
> @@ -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

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

[Jagan Teki]

On Tue, Jan 17, 2023 at 4:37 PM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> On 17/01/2023 11:55, Jagan Teki wrote:
> > 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 <amadeus@jmu.edu.cn>
> > Reported-by: FUKAUMI Naoki <naoki@radxa.com>
> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> > ---
> >  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(-)
> >
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
> > index 225dbbe4955d..0c9a918b809a 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
> > +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
> > @@ -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.

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

>
> >
> >       aliases {
> >               mmc0 = &sdhci;
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
> > index a4c33310ca42..8ca15b723799 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
> > +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
> > @@ -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...

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.

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

[Krzysztof Kozlowski]

On 17/01/2023 13:52, Jagan Teki wrote:
> On Tue, Jan 17, 2023 at 4:37 PM Krzysztof Kozlowski
> <krzysztof.kozlowski@linaro.org> wrote:
>>
>> On 17/01/2023 11:55, Jagan Teki wrote:
>>> 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 <amadeus@jmu.edu.cn>
>>> Reported-by: FUKAUMI Naoki <naoki@radxa.com>
>>> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
>>> ---
>>>  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(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
>>> index 225dbbe4955d..0c9a918b809a 100644
>>> --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
>>> +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
>>> @@ -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.
> 
> 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.

> 
>>
>>>
>>>       aliases {
>>>               mmc0 = &sdhci;
>>> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
>>> index a4c33310ca42..8ca15b723799 100644
>>> --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
>>> +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
>>> @@ -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...
> 
> 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

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

[Jagan Teki]

On Tue, Jan 17, 2023 at 6:28 PM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> On 17/01/2023 13:52, Jagan Teki wrote:
> > On Tue, Jan 17, 2023 at 4:37 PM Krzysztof Kozlowski
> > <krzysztof.kozlowski@linaro.org> wrote:
> >>
> >> On 17/01/2023 11:55, Jagan Teki wrote:
> >>> 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 <amadeus@jmu.edu.cn>
> >>> Reported-by: FUKAUMI Naoki <naoki@radxa.com>
> >>> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> >>> ---
> >>>  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(-)
> >>>
> >>> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
> >>> index 225dbbe4955d..0c9a918b809a 100644
> >>> --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
> >>> +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
> >>> @@ -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.
> >
> > 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"

>
> >
> >>
> >>>
> >>>       aliases {
> >>>               mmc0 = &sdhci;
> >>> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
> >>> index a4c33310ca42..8ca15b723799 100644
> >>> --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
> >>> +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
> >>> @@ -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...
> >
> > 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.

[PATCH 5/7] arm64: dts: rockchip: Drop unneeded model for Radxa CM3i

[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.

Cc: Chukun Pan <amadeus@jmu.edu.cn>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 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 0c9a918b809a..1bada98a4d8b 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,radxa-cm3i", "rockchip,rk3568";
 
 	aliases {
-- 
2.25.1

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

[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.

Reported-by: FUKAUMI Naoki <naoki@radxa.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 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(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
index bf9eb0405b62..8b8992a8e9c0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
@@ -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 {
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
index 8ca15b723799..6a3d964f6207 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
@@ -8,8 +8,7 @@ / {
 	compatible = "radxa,radxa-e25", "radxa,radxa-cm3i", "rockchip,rk3568";
 
 	aliases {
-		mmc0 = &sdmmc0;
-		mmc1 = &sdhci;
+		mmc1 = &sdmmc0;
 	};
 
 	pwm-leds {
-- 
2.25.1

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

[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.

Reported-by: FUKAUMI Naoki <naoki@radxa.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 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(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
index 309c35d7fca8..028eb508ae30 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
@@ -15,8 +15,8 @@ / {
 	compatible = "radxa,rock-4c-plus", "rockchip,rk3399";
 
 	aliases {
-		mmc0 = &sdmmc;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 	};
 
 	chosen {
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
index 1f76d3501bda..907071d4fe80 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -13,8 +13,8 @@
 
 / {
 	aliases {
-		mmc0 = &sdmmc;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 	};
 
 	chosen {
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
index cd1e1d8e1244..77ba37ce6d6c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
@@ -13,8 +13,8 @@ / {
 
 	aliases {
 		ethernet0 = &gmac1;
-		mmc0 = &sdmmc0;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc0;
 	};
 
 	chosen: chosen {
-- 
2.25.1

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

[Krzysztof Kozlowski]

On 17/01/2023 11:54, Jagan Teki wrote:
> 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.


Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof