diff mbox series

[4/6] riscv: microchip: mpfs: fix board compatible

Message ID 20210819154436.117798-4-krzysztof.kozlowski@canonical.com
State New
Headers show
Series [1/6] dt-bindings: riscv: correct e51 and u54-mc CPU bindings | expand

Commit Message

Krzysztof Kozlowski Aug. 19, 2021, 3:44 p.m. UTC
According to bindings, the compatible must include microchip,mpfs.  This
fixes dtbs_check warning:

  arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dt.yaml: /: compatible: ['microchip,mpfs-icicle-kit'] is too short

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts | 2 +-
 arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Geert Uytterhoeven Aug. 24, 2021, 3:29 p.m. UTC | #1
Hi Krzysztof,

On Thu, Aug 19, 2021 at 5:45 PM Krzysztof Kozlowski
<krzysztof.kozlowski@canonical.com> wrote:
> According to bindings, the compatible must include microchip,mpfs.  This

> fixes dtbs_check warning:

>

>   arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dt.yaml: /: compatible: ['microchip,mpfs-icicle-kit'] is too short

>

> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>


Thanks for your patch!

> --- a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts

> +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts

> @@ -10,7 +10,7 @@

>

>  / {

>         model = "Microchip PolarFire-SoC Icicle Kit";

> -       compatible = "microchip,mpfs-icicle-kit";

> +       compatible = "microchip,mpfs-icicle-kit", "microchip,mpfs";


I have the same change in my local tree, but didn't get to submit it
yet, so this part is fine ;-)

>

>         chosen {

>                 stdout-path = &serial0;

> diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi

> index b9819570a7d1..cb54da0cc3c4 100644

> --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi

> +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi

> @@ -7,7 +7,7 @@ / {

>         #address-cells = <2>;

>         #size-cells = <2>;

>         model = "Microchip MPFS Icicle Kit";

> -       compatible = "microchip,mpfs-icicle-kit";

> +       compatible = "microchip,mpfs-icicle-kit", "microchip,mpfs";


As this file is the SoC .dtsi, not the board DTS for the full
Icicle Kit, the compatible value should be just "microchip,mpfs"
(to be augmented by the board DTS).
And "model" should be "Microchip PolarFire SoC".

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Krzysztof Kozlowski Aug. 24, 2021, 7:05 p.m. UTC | #2
On 24/08/2021 17:29, Geert Uytterhoeven wrote:
> Hi Krzysztof,

> 

> On Thu, Aug 19, 2021 at 5:45 PM Krzysztof Kozlowski

> <krzysztof.kozlowski@canonical.com> wrote:

>> According to bindings, the compatible must include microchip,mpfs.  This

>> fixes dtbs_check warning:

>>

>>   arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dt.yaml: /: compatible: ['microchip,mpfs-icicle-kit'] is too short

>>

>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

> 

> Thanks for your patch!

> 

>> --- a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts

>> +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts

>> @@ -10,7 +10,7 @@

>>

>>  / {

>>         model = "Microchip PolarFire-SoC Icicle Kit";

>> -       compatible = "microchip,mpfs-icicle-kit";

>> +       compatible = "microchip,mpfs-icicle-kit", "microchip,mpfs";

> 

> I have the same change in my local tree, but didn't get to submit it

> yet, so this part is fine ;-)

> 

>>

>>         chosen {

>>                 stdout-path = &serial0;

>> diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi

>> index b9819570a7d1..cb54da0cc3c4 100644

>> --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi

>> +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi

>> @@ -7,7 +7,7 @@ / {

>>         #address-cells = <2>;

>>         #size-cells = <2>;

>>         model = "Microchip MPFS Icicle Kit";

>> -       compatible = "microchip,mpfs-icicle-kit";

>> +       compatible = "microchip,mpfs-icicle-kit", "microchip,mpfs";

> 

> As this file is the SoC .dtsi, not the board DTS for the full

> Icicle Kit, the compatible value should be just "microchip,mpfs"

> (to be augmented by the board DTS).

> And "model" should be "Microchip PolarFire SoC".



Sounds good, I'll fix it in v2.


Best regards,
Krzysztof
diff mbox series

Patch

diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
index 237830583514..62f7651de538 100644
--- a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
+++ b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
@@ -10,7 +10,7 @@ 
 
 / {
 	model = "Microchip PolarFire-SoC Icicle Kit";
-	compatible = "microchip,mpfs-icicle-kit";
+	compatible = "microchip,mpfs-icicle-kit", "microchip,mpfs";
 
 	chosen {
 		stdout-path = &serial0;
diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
index b9819570a7d1..cb54da0cc3c4 100644
--- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
+++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
@@ -7,7 +7,7 @@  / {
 	#address-cells = <2>;
 	#size-cells = <2>;
 	model = "Microchip MPFS Icicle Kit";
-	compatible = "microchip,mpfs-icicle-kit";
+	compatible = "microchip,mpfs-icicle-kit", "microchip,mpfs";
 
 	chosen {
 	};