Message ID | 20210819154436.117798-4-krzysztof.kozlowski@canonical.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/6] dt-bindings: riscv: correct e51 and u54-mc CPU bindings | expand |
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
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 --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 { };
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(-)