From: Stefano Radaelli Document the existing VAR-SOM-6UL Concerto compatibles and the new VAR-SOM-6UL and DART-6UL board variants based on i.MX6UL, i.MX6ULL and i.MX6ULZ. Add specific compatibles for the storage, wireless, audio and carrier combinations while retaining the legacy Concerto strings. Signed-off-by: Stefano Radaelli --- .../devicetree/bindings/arm/fsl.yaml | 148 ++++++++++++++++-- 1 file changed, 138 insertions(+), 10 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml index 36e28e0e4ad9..726d563d1482 100644 --- a/Documentation/devicetree/bindings/arm/fsl.yaml +++ b/Documentation/devicetree/bindings/arm/fsl.yaml @@ -688,11 +688,51 @@ properties: - const: phytec,imx6ul-pcl063 # PHYTEC phyCORE-i.MX 6UL - const: fsl,imx6ul - - description: i.MX6UL Variscite VAR-SOM-6UL Boards - items: - - const: variscite,mx6ulconcerto - - const: variscite,var-som-imx6ul - - const: fsl,imx6ul + - description: i.MX6UL Variscite VAR-SOM-6UL and DART-6UL Boards + oneOf: + - items: + - enum: + - variscite,mx6ulconcerto + - variscite,var-som-imx6ul-emmc-sd-card-wm8731-concerto-board + - variscite,var-som-imx6ul-emmc-sd-card-concerto-board + - variscite,var-som-imx6ul-emmc-wifi-brcm-wm8731-concerto-board + - variscite,var-som-imx6ul-emmc-wifi-brcm-concerto-board + - variscite,var-som-imx6ul-emmc-wifi-iw61x-concerto-board + - variscite,var-som-imx6ul-nand-sd-card-wm8731-concerto-board + - variscite,var-som-imx6ul-nand-sd-card-concerto-board + - variscite,var-som-imx6ul-nand-wifi-brcm-wm8731-concerto-board + - variscite,var-som-imx6ul-nand-wifi-brcm-concerto-board + - variscite,var-som-imx6ul-nand-wifi-iw61x-concerto-board + - const: variscite,var-som-imx6ul + - const: fsl,imx6ul + - items: + - enum: + - variscite,var-som-imx6ul-emmc-sd-card-wm8731-symphony-board + - variscite,var-som-imx6ul-emmc-sd-card-symphony-board + - variscite,var-som-imx6ul-emmc-wifi-brcm-wm8731-symphony-board + - variscite,var-som-imx6ul-emmc-wifi-brcm-symphony-board + - variscite,var-som-imx6ul-emmc-wifi-iw61x-symphony-board + - variscite,var-som-imx6ul-nand-sd-card-wm8731-symphony-board + - variscite,var-som-imx6ul-nand-sd-card-symphony-board + - variscite,var-som-imx6ul-nand-wifi-brcm-wm8731-symphony-board + - variscite,var-som-imx6ul-nand-wifi-brcm-symphony-board + - variscite,var-som-imx6ul-nand-wifi-iw61x-symphony-board + - const: variscite,var-som-imx6ul + - const: fsl,imx6ul + - items: + - enum: + - variscite,dart-6ul-imx6ul-emmc-sd-card-wm8731-6ulcustomboard + - variscite,dart-6ul-imx6ul-emmc-sd-card-6ulcustomboard + - variscite,dart-6ul-imx6ul-emmc-wifi-brcm-wm8731-6ulcustomboard + - variscite,dart-6ul-imx6ul-emmc-wifi-brcm-6ulcustomboard + - variscite,dart-6ul-imx6ul-emmc-wifi-iw61x-6ulcustomboard + - variscite,dart-6ul-imx6ul-nand-sd-card-wm8731-6ulcustomboard + - variscite,dart-6ul-imx6ul-nand-sd-card-6ulcustomboard + - variscite,dart-6ul-imx6ul-nand-wifi-brcm-wm8731-6ulcustomboard + - variscite,dart-6ul-imx6ul-nand-wifi-brcm-6ulcustomboard + - variscite,dart-6ul-imx6ul-nand-wifi-iw61x-6ulcustomboard + - const: variscite,dart-6ul-imx6ul + - const: fsl,imx6ul - description: Kontron BL i.MX6UL (N631X S) Board items: @@ -797,11 +837,51 @@ properties: - const: phytec,imx6ull-pcl063 # PHYTEC phyCORE-i.MX 6ULL - const: fsl,imx6ull - - description: i.MX6ULL Variscite VAR-SOM-6UL Boards - items: - - const: variscite,mx6ullconcerto # Variscite VAR-SOM-6UL dev kit board - - const: variscite,var-som-imx6ull # Variscite VAR-SOM-6UL SoM (6ULL variant) - - const: fsl,imx6ull + - description: i.MX6ULL Variscite VAR-SOM-6UL and DART-6UL Boards + oneOf: + - items: + - enum: + - variscite,mx6ullconcerto + - variscite,var-som-imx6ull-emmc-sd-card-wm8731-concerto-board + - variscite,var-som-imx6ull-emmc-sd-card-concerto-board + - variscite,var-som-imx6ull-emmc-wifi-brcm-wm8731-concerto-board + - variscite,var-som-imx6ull-emmc-wifi-brcm-concerto-board + - variscite,var-som-imx6ull-emmc-wifi-iw61x-concerto-board + - variscite,var-som-imx6ull-nand-sd-card-wm8731-concerto-board + - variscite,var-som-imx6ull-nand-sd-card-concerto-board + - variscite,var-som-imx6ull-nand-wifi-brcm-wm8731-concerto-board + - variscite,var-som-imx6ull-nand-wifi-brcm-concerto-board + - variscite,var-som-imx6ull-nand-wifi-iw61x-concerto-board + - const: variscite,var-som-imx6ull + - const: fsl,imx6ull + - items: + - enum: + - variscite,var-som-imx6ull-emmc-sd-card-wm8731-symphony-board + - variscite,var-som-imx6ull-emmc-sd-card-symphony-board + - variscite,var-som-imx6ull-emmc-wifi-brcm-wm8731-symphony-board + - variscite,var-som-imx6ull-emmc-wifi-brcm-symphony-board + - variscite,var-som-imx6ull-emmc-wifi-iw61x-symphony-board + - variscite,var-som-imx6ull-nand-sd-card-wm8731-symphony-board + - variscite,var-som-imx6ull-nand-sd-card-symphony-board + - variscite,var-som-imx6ull-nand-wifi-brcm-wm8731-symphony-board + - variscite,var-som-imx6ull-nand-wifi-brcm-symphony-board + - variscite,var-som-imx6ull-nand-wifi-iw61x-symphony-board + - const: variscite,var-som-imx6ull + - const: fsl,imx6ull + - items: + - enum: + - variscite,dart-6ul-imx6ull-emmc-sd-card-wm8731-6ulcustomboard + - variscite,dart-6ul-imx6ull-emmc-sd-card-6ulcustomboard + - variscite,dart-6ul-imx6ull-emmc-wifi-brcm-wm8731-6ulcustomboard + - variscite,dart-6ul-imx6ull-emmc-wifi-brcm-6ulcustomboard + - variscite,dart-6ul-imx6ull-emmc-wifi-iw61x-6ulcustomboard + - variscite,dart-6ul-imx6ull-nand-sd-card-wm8731-6ulcustomboard + - variscite,dart-6ul-imx6ull-nand-sd-card-6ulcustomboard + - variscite,dart-6ul-imx6ull-nand-wifi-brcm-wm8731-6ulcustomboard + - variscite,dart-6ul-imx6ull-nand-wifi-brcm-6ulcustomboard + - variscite,dart-6ul-imx6ull-nand-wifi-iw61x-6ulcustomboard + - const: variscite,dart-6ul-imx6ull + - const: fsl,imx6ull - description: i.MX6ULL Boards with Toradex Colibri iMX6ULL Modules items: @@ -870,6 +950,54 @@ properties: - const: fsl,imx6ull # This seems odd. Should be last? - const: fsl,imx6ulz + - description: i.MX6ULZ Variscite VAR-SOM-6UL and DART-6UL Boards + oneOf: + - items: + - enum: + - variscite,var-som-imx6ulz-emmc-sd-card-wm8731-concerto-board + - variscite,var-som-imx6ulz-emmc-sd-card-concerto-board + - variscite,var-som-imx6ulz-emmc-wifi-brcm-wm8731-concerto-board + - variscite,var-som-imx6ulz-emmc-wifi-brcm-concerto-board + - variscite,var-som-imx6ulz-emmc-wifi-iw61x-concerto-board + - variscite,var-som-imx6ulz-nand-sd-card-wm8731-concerto-board + - variscite,var-som-imx6ulz-nand-sd-card-concerto-board + - variscite,var-som-imx6ulz-nand-wifi-brcm-wm8731-concerto-board + - variscite,var-som-imx6ulz-nand-wifi-brcm-concerto-board + - variscite,var-som-imx6ulz-nand-wifi-iw61x-concerto-board + - const: variscite,var-som-imx6ulz + - const: fsl,imx6ull + - const: fsl,imx6ulz + - items: + - enum: + - variscite,var-som-imx6ulz-emmc-sd-card-wm8731-symphony-board + - variscite,var-som-imx6ulz-emmc-sd-card-symphony-board + - variscite,var-som-imx6ulz-emmc-wifi-brcm-wm8731-symphony-board + - variscite,var-som-imx6ulz-emmc-wifi-brcm-symphony-board + - variscite,var-som-imx6ulz-emmc-wifi-iw61x-symphony-board + - variscite,var-som-imx6ulz-nand-sd-card-wm8731-symphony-board + - variscite,var-som-imx6ulz-nand-sd-card-symphony-board + - variscite,var-som-imx6ulz-nand-wifi-brcm-wm8731-symphony-board + - variscite,var-som-imx6ulz-nand-wifi-brcm-symphony-board + - variscite,var-som-imx6ulz-nand-wifi-iw61x-symphony-board + - const: variscite,var-som-imx6ulz + - const: fsl,imx6ull + - const: fsl,imx6ulz + - items: + - enum: + - variscite,dart-6ul-imx6ulz-emmc-sd-card-wm8731-6ulcustomboard + - variscite,dart-6ul-imx6ulz-emmc-sd-card-6ulcustomboard + - variscite,dart-6ul-imx6ulz-emmc-wifi-brcm-wm8731-6ulcustomboard + - variscite,dart-6ul-imx6ulz-emmc-wifi-brcm-6ulcustomboard + - variscite,dart-6ul-imx6ulz-emmc-wifi-iw61x-6ulcustomboard + - variscite,dart-6ul-imx6ulz-nand-sd-card-wm8731-6ulcustomboard + - variscite,dart-6ul-imx6ulz-nand-sd-card-6ulcustomboard + - variscite,dart-6ul-imx6ulz-nand-wifi-brcm-wm8731-6ulcustomboard + - variscite,dart-6ul-imx6ulz-nand-wifi-brcm-6ulcustomboard + - variscite,dart-6ul-imx6ulz-nand-wifi-iw61x-6ulcustomboard + - const: variscite,dart-6ul-imx6ulz + - const: fsl,imx6ull + - const: fsl,imx6ulz + - description: i.MX7S based Boards items: - enum: -- 2.47.3