This patch fixes the following errors during make dtbs_check:
arch/arm64/boot/dts/freescale/imx8mp-evk.dt.yaml: can@308c0000: compatible: 'oneOf' conditional failed, one must be fixed:
['fsl,imx8mp-flexcan', 'fsl,imx6q-flexcan'] is too long
Additional items are not allowed ('fsl,imx6q-flexcan' was unexpected)
'fsl,imx8mp-flexcan' is not one of ['fsl,imx53-flexcan', 'fsl,imx35-flexcan']
'fsl,imx8mp-flexcan' is not one of ['fsl,imx7d-flexcan', 'fsl,imx6ul-flexcan', 'fsl,imx6sx-flexcan']
'fsl,imx8mp-flexcan' is not one of ['fsl,ls1028ar1-flexcan']
'fsl,imx25-flexcan' was expected
'fsl,lx2160ar1-flexcan' was expected
Cc: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Cc: Joakim Zhang <qiangqing.zhang@xxxxxxx>
Cc: Rob Herring <robh+dt@xxxxxxxxxx>
Cc: linux-can@xxxxxxxxxxxxxxx
Cc: netdev@xxxxxxxxxxxxxxx
Signed-off-by: Dong Aisheng <aisheng.dong@xxxxxxx>
---
Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml b/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
index 55bff1586b6f..ca9caac68777 100644
--- a/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
+++ b/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
@@ -18,7 +18,6 @@ properties:
oneOf:
- enum:
- fsl,imx8qm-flexcan
- - fsl,imx8mp-flexcan
- fsl,imx6q-flexcan
- fsl,imx28-flexcan
- fsl,imx25-flexcan
@@ -33,6 +32,7 @@ properties:
- const: fsl,imx25-flexcan
- items:
- enum:
+ - fsl,imx8mp-flexcan
- fsl,imx7d-flexcan
- fsl,imx6ul-flexcan
- fsl,imx6sx-flexcan
--
2.25.1
