Re: [PATCH 3/4] dt-bindings: arm: fix Rockchip rk3399-evb bindings

Robin Murphy
2020-02-28T12:43:04Z

On 28/02/2020 6:14 am, Johan Jonker wrote:
> A test with the command below gives this error:
>
> arch/arm64/boot/dts/rockchip/rk3399-evb.dt.yaml: /: compatible:
> ['rockchip,rk3399-evb', 'rockchip,rk3399', 'google,rk3399evb-rev2']
> is not valid under any of the given schemas
>
> Fix this error by adding 'google,rk3399evb-rev2' to the compatible
> property in rockchip.yaml
>
> make ARCH=arm64 dtbs_check
> DT_SCHEMA_FILES=Documentation/devicetree/bindings/arm/rockchip.yaml
>
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> ---
> Documentation/devicetree/bindings/arm/rockchip.yaml | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
> index d303790f5..6c6e8273e 100644
> --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> @@ -509,6 +509,7 @@ properties:
> items:
> - const: rockchip,rk3399-evb
> - const: rockchip,rk3399
> + - const: google,rk3399evb-rev2

This looks wrong - the board can't reasonably be a *more* general match
than the SoC. If this is supposed to represent a specific variant of the
basic EVB design then it should come before "rockchip,rk3399-evb" (and
possibly be optional if other variants also exist).

Robin.

>
> - description: Rockchip RK3399 Sapphire standalone
> items:
>