From: Marcel Ziswiler <[email protected]>
Simplify and unify the distinction between modules and carrier boards.
Signed-off-by: Marcel Ziswiler <[email protected]>
Acked-by: Rob Herring <[email protected]>
Reviewed-by: Fabio Estevam <[email protected]>
---
Changes in v3:
- Add Fabio's reviewed-by. Thanks!
- Add Rob's ack. Thanks!
Changes in v2:
- New patch cleaning-up dt-bindings documentation.
.../devicetree/bindings/arm/fsl.yaml | 79 ++++++++++---------
1 file changed, 41 insertions(+), 38 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml
index 60f4862ba15e7..a95314bd271c7 100644
--- a/Documentation/devicetree/bindings/arm/fsl.yaml
+++ b/Documentation/devicetree/bindings/arm/fsl.yaml
@@ -235,7 +235,7 @@ properties:
- technexion,imx6q-pico-pi # TechNexion i.MX6Q Pico-Pi
- technologic,imx6q-ts4900
- technologic,imx6q-ts7970
- - toradex,apalis_imx6q # Apalis iMX6 Module
+ - toradex,apalis_imx6q # Apalis iMX6 Modules
- udoo,imx6q-udoo # Udoo i.MX6 Quad Board
- uniwest,imx6q-evi # Uniwest Evi
- variscite,dt6customboard
@@ -314,18 +314,12 @@ properties:
- const: phytec,imx6q-pfla02 # PHYTEC phyFLEX-i.MX6 Quad
- const: fsl,imx6q
- - description: i.MX6Q Boards with Toradex Apalis iMX6Q/D Module
+ - description: i.MX6Q Boards with Toradex Apalis iMX6Q/D Modules
items:
- enum:
- - toradex,apalis_imx6q-ixora # Apalis iMX6Q/D Module on Ixora Carrier Board
- - toradex,apalis_imx6q-eval # Apalis iMX6Q/D Module on Apalis Evaluation Board
- - const: toradex,apalis_imx6q
- - const: fsl,imx6q
-
- - description: i.MX6Q Toradex Apalis iMX6Q/D Module on Ixora Carrier Board V1.1
- items:
- - const: toradex,apalis_imx6q-ixora-v1.1
- - const: toradex,apalis_imx6q-ixora
+ - toradex,apalis_imx6q-ixora # Apalis iMX6Q/D Module on Ixora Carrier Board
+ - toradex,apalis_imx6q-ixora-v1.1 # Apalis iMX6Q/D Module on Ixora V1.1 Carrier Board
+ - toradex,apalis_imx6q-eval # Apalis iMX6Q/D Module on Apalis Evaluation Board
- const: toradex,apalis_imx6q
- const: fsl,imx6q
@@ -393,6 +387,8 @@ properties:
- technexion,imx6dl-pico-pi # TechNexion i.MX6DL Pico-Pi
- technologic,imx6dl-ts4900
- technologic,imx6dl-ts7970
+ - toradex,colibri_imx6dl # Colibri iMX6 Modules
+ - toradex,colibri_imx6dl-v1_1 # Colibri iMX6 V1.1 Modules
- udoo,imx6dl-udoo # Udoo i.MX6 Dual-lite Board
- vdl,lanmcu # Van der Laan LANMCU board
- wand,imx6dl-wandboard # Wandboard i.MX6 Dual Lite Board
@@ -466,20 +462,18 @@ properties:
- const: phytec,imx6dl-pfla02 # PHYTEC phyFLEX-i.MX6 Quad
- const: fsl,imx6dl
- - description: i.MX6DL Toradex Colibri iMX6 Module on Colibri
- Evaluation Board V3
+ - description: i.MX6DL Boards with Toradex Colibri iMX6DL/S Modules
items:
- - const: toradex,colibri_imx6dl-eval-v3
- - const: toradex,colibri_imx6dl # Colibri iMX6 Module
+ - enum:
+ - toradex,colibri_imx6dl-eval-v3 # Colibri iMX6DL/S Module on Colibri Evaluation Board V3
+ - const: toradex,colibri_imx6dl # Colibri iMX6DL/S Module
- const: fsl,imx6dl
- - description: i.MX6DL Toradex Colibri iMX6 Module V1.1 on Colibri
- Evaluation Board V3
+ - description: i.MX6DL Boards with Toradex Colibri iMX6DL/S V1.1 Modules
items:
- - const: toradex,colibri_imx6dl-v1_1-eval-v3
- - const: toradex,colibri_imx6dl-v1_1 # Colibri iMX6 Module V1.1
- - const: toradex,colibri_imx6dl-eval-v3
- - const: toradex,colibri_imx6dl # Colibri iMX6 Module
+ - enum:
+ - toradex,colibri_imx6dl-v1_1-eval-v3 # Colibri iMX6DL/S V1.1 Module on Colibri Evaluation Board V3
+ - const: toradex,colibri_imx6dl-v1_1 # Colibri iMX6DL/S V1.1 Module
- const: fsl,imx6dl
- description: i.MX6S DHCOM DRC02 Board
@@ -586,8 +580,8 @@ properties:
- fsl,imx6ull-14x14-evk # i.MX6 UltraLiteLite 14x14 EVK Board
- kontron,imx6ull-n6411-som # Kontron N6411 SOM
- myir,imx6ull-mys-6ulx-eval # MYiR Tech iMX6ULL Evaluation Board
- - toradex,colibri-imx6ull-eval # Colibri iMX6ULL Module on Colibri Eval Board
- - toradex,colibri-imx6ull-wifi-eval # Colibri iMX6ULL Wi-Fi / BT Module on Colibri Eval Board
+ - toradex,colibri-imx6ull # Colibri iMX6ULL Modules
+ - toradex,colibri-imx6ull-wifi # Colibri iMX6ULL Wi-Fi / BT Modules
- const: fsl,imx6ull
- description: i.MX6ULL Armadeus Systems OPOS6ULDev Board
@@ -605,6 +599,20 @@ properties:
- const: phytec,imx6ull-pcl063 # PHYTEC phyCORE-i.MX 6ULL
- const: fsl,imx6ull
+ - description: i.MX6ULL Boards with Toradex Colibri iMX6ULL Modules
+ items:
+ - enum:
+ - toradex,colibri-imx6ull-eval # Colibri iMX6ULL Module on Colibri Evaluation Board
+ - const: toradex,colibri-imx6ull # Colibri iMX6ULL Module
+ - const: fsl,imx6dl
+
+ - description: i.MX6ULL Boards with Toradex Colibri iMX6ULL Wi-Fi / BT Modules
+ items:
+ - enum:
+ - toradex,colibri-imx6ull-wifi-eval # Colibri iMX6ULL Wi-Fi / BT Module on Colibri Evaluation Board
+ - const: toradex,colibri-imx6ull-wifi # Colibri iMX6ULL Wi-Fi / BT Module
+ - const: fsl,imx6dl
+
- description: Kontron N6411 S Board
items:
- const: kontron,imx6ull-n6411-s
@@ -622,6 +630,7 @@ properties:
items:
- enum:
- element14,imx7s-warp # Element14 Warp i.MX7 Board
+ - toradex,colibri-imx7s # Colibri iMX7S Module
- const: fsl,imx7s
- description: i.MX7S Boards with Toradex Colibri iMX7S Module
@@ -653,15 +662,8 @@ properties:
- technexion,imx7d-pico-hobbit # TechNexion i.MX7D Pico-Hobbit
- technexion,imx7d-pico-nymph # TechNexion i.MX7D Pico-Nymph
- technexion,imx7d-pico-pi # TechNexion i.MX7D Pico-Pi
- - toradex,colibri-imx7d # Colibri iMX7 Dual Module
- - toradex,colibri-imx7d-aster # Colibri iMX7 Dual Module on Aster Carrier Board
- - toradex,colibri-imx7d-emmc # Colibri iMX7 Dual 1GB (eMMC) Module
- - toradex,colibri-imx7d-emmc-aster # Colibri iMX7 Dual 1GB (eMMC) Module on
- # Aster Carrier Board
- - toradex,colibri-imx7d-emmc-eval-v3 # Colibri iMX7 Dual 1GB (eMMC) Module on
- # Colibri Evaluation Board V3
- - toradex,colibri-imx7d-eval-v3 # Colibri iMX7 Dual Module on
- # Colibri Evaluation Board V3
+ - toradex,colibri-imx7d # Colibri iMX7D Module
+ - toradex,colibri-imx7d-emmc # Colibri iMX7D 1GB (eMMC) Module
- zii,imx7d-rmu2 # ZII RMU2 Board
- zii,imx7d-rpu2 # ZII RPU2 Board
- const: fsl,imx7d
@@ -686,12 +688,12 @@ properties:
- description: i.MX7D Boards with Toradex Colibri i.MX7D Module
items:
- enum:
- - toradex,colibri-imx7d-aster # Module on Aster Carrier Board
- - toradex,colibri-imx7d-eval-v3 # Module on Colibri Evaluation Board V3
+ - toradex,colibri-imx7d-aster # Colibri iMX7D Module on Aster Carrier Board
+ - toradex,colibri-imx7d-eval-v3 # Colibri iMX7D Module on Colibri Evaluation Board V3
- const: toradex,colibri-imx7d
- const: fsl,imx7d
- - description: i.MX7D Boards with Toradex Colibri i.MX7D eMMC Module
+ - description: i.MX7D Boards with Toradex Colibri i.MX7D 1GB (eMMC) Module
items:
- enum:
- toradex,colibri-imx7d-emmc-aster # Module on Aster Carrier Board
@@ -812,10 +814,10 @@ properties:
- enum:
- einfochips,imx8qxp-ai_ml # i.MX8QXP AI_ML Board
- fsl,imx8qxp-mek # i.MX8QXP MEK Board
- - toradex,colibri-imx8x # Colibri iMX8X Module
+ - toradex,colibri-imx8x # Colibri iMX8X Modules
- const: fsl,imx8qxp
- - description: Toradex Colibri i.MX8 Evaluation Board
+ - description: i.MX8QXP Boards with Toradex Coilbri iMX8X Modules
items:
- enum:
- toradex,colibri-imx8x-eval-v3 # Colibri iMX8X Module on Colibri Evaluation Board V3
@@ -847,9 +849,10 @@ properties:
- description: VF610 based Boards
items:
- enum:
+ - fsl,vf610-twr # VF610 Tower Board
- lwn,bk4 # Liebherr BK4 controller
- phytec,vf610-cosmic # PHYTEC Cosmic/Cosmic+ Board
- - fsl,vf610-twr # VF610 Tower Board
+ - toradex,vf610-colibri_vf61 # Colibri VF61 Modules
- const: fsl,vf610
- description: Toradex Colibri VF61 Module on Colibri Evaluation Board
--
2.26.2
On Sun, 19 Sep 2021 14:55:34 +0200, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <[email protected]>
>
> Simplify and unify the distinction between modules and carrier boards.
>
> Signed-off-by: Marcel Ziswiler <[email protected]>
> Acked-by: Rob Herring <[email protected]>
> Reviewed-by: Fabio Estevam <[email protected]>
>
> ---
>
> Changes in v3:
> - Add Fabio's reviewed-by. Thanks!
> - Add Rob's ack. Thanks!
>
> Changes in v2:
> - New patch cleaning-up dt-bindings documentation.
>
> .../devicetree/bindings/arm/fsl.yaml | 79 ++++++++++---------
> 1 file changed, 41 insertions(+), 38 deletions(-)
>
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
./Documentation/devicetree/bindings/arm/fsl.yaml:475:111: [warning] line too long (113 > 110 characters) (line-length)
./Documentation/devicetree/bindings/arm/fsl.yaml:612:111: [warning] line too long (113 > 110 characters) (line-length)
dtschema/dtc warnings/errors:
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/patch/1529833
This check can fail if there are any dependencies. The base for a patch
series is generally the most recent rc1.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit.
Hi Rob
On Mon, 2021-09-20 at 07:28 -0500, Rob Herring wrote:
> On Sun, 19 Sep 2021 14:55:34 +0200, Marcel Ziswiler wrote:
> > From: Marcel Ziswiler <[email protected]>
> >
> > Simplify and unify the distinction between modules and carrier boards.
> >
> > Signed-off-by: Marcel Ziswiler <[email protected]>
> > Acked-by: Rob Herring <[email protected]>
> > Reviewed-by: Fabio Estevam <[email protected]>
> >
> > ---
> >
> > Changes in v3:
> > - Add Fabio's reviewed-by. Thanks!
> > - Add Rob's ack. Thanks!
> >
> > Changes in v2:
> > - New patch cleaning-up dt-bindings documentation.
> >
> > .../devicetree/bindings/arm/fsl.yaml | 79 ++++++++++---------
> > 1 file changed, 41 insertions(+), 38 deletions(-)
> >
>
> My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
> on your patch (DT_CHECKER_FLAGS is new in v5.13):
>
> yamllint warnings/errors:
> ./Documentation/devicetree/bindings/arm/fsl.yaml:475:111: [warning] line too long (113 > 110 characters)
> (line-length)
> ./Documentation/devicetree/bindings/arm/fsl.yaml:612:111: [warning] line too long (113 > 110 characters)
> (line-length)
>
> dtschema/dtc warnings/errors:
>
> doc reference errors (make refcheckdocs):
>
> See https://patchwork.ozlabs.org/patch/1529833
>
> This check can fail if there are any dependencies. The base for a patch
> series is generally the most recent rc1.
>
> If you already ran 'make dt_binding_check' and didn't see the above
> error(s), then make sure 'yamllint' is installed and dt-schema is up to
> date:
>
> pip3 install dtschema --upgrade
Strange, I have done all of that but I still can not convince dt_binding_check on my system to show me that
same yamllint warnings/errors on that fsl.yaml file. However, it otherwise seems to work as it shows dozens of
other issues throughout Documentation/devicetree/bindings but those are not for me to fix, at least not right
now (;-p).
> Please check and re-submit.
Anyway, I already prepared a V4 with this fixed. Just about to send it out.
Thanks, and sorry again that I missed this.
Cheers
Marcel
On Mon, 2021-09-20 at 07:28 -0500, Rob Herring wrote:
> On Sun, 19 Sep 2021 14:55:34 +0200, Marcel Ziswiler wrote:
> > From: Marcel Ziswiler <[email protected]>
> >
> > Simplify and unify the distinction between modules and carrier boards.
> >
> > Signed-off-by: Marcel Ziswiler <[email protected]>
> > Acked-by: Rob Herring <[email protected]>
> > Reviewed-by: Fabio Estevam <[email protected]>
> >
> > ---
> >
> > Changes in v3:
> > - Add Fabio's reviewed-by. Thanks!
> > - Add Rob's ack. Thanks!
> >
> > Changes in v2:
> > - New patch cleaning-up dt-bindings documentation.
> >
> > .../devicetree/bindings/arm/fsl.yaml | 79 ++++++++++---------
> > 1 file changed, 41 insertions(+), 38 deletions(-)
> >
>
> My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
> on your patch (DT_CHECKER_FLAGS is new in v5.13):
>
> yamllint warnings/errors:
> ./Documentation/devicetree/bindings/arm/fsl.yaml:475:111: [warning] line too long (113 > 110 characters)
> (line-length)
> ./Documentation/devicetree/bindings/arm/fsl.yaml:612:111: [warning] line too long (113 > 110 characters)
> (line-length)
>
> dtschema/dtc warnings/errors:
>
> doc reference errors (make refcheckdocs):
>
> See https://patchwork.ozlabs.org/patch/1529833
>
> This check can fail if there are any dependencies. The base for a patch
> series is generally the most recent rc1.
>
> If you already ran 'make dt_binding_check' and didn't see the above
> error(s), then make sure 'yamllint' is installed and dt-schema is up to
> date:
>
> pip3 install dtschema --upgrade
After submitting the fixed V4 I went back to my V3 branch and now it suddenly shows it properly. I guess,
something got stuck somewhere (;-p).
⬢[zim@toolbox linux-next.git]$ make O=../../Builds/linux-arm-next-imx_v6_v7/ DT_CHECKER_FLAGS=-m
DT_SCHEMA_FILES=Documentation/devicetree/bindings/arm/fsl.yaml dt_binding_check
make[1]: Entering directory '/var/home/zim/Builds/linux-arm-next-imx_v6_v7'
LINT Documentation/devicetree/bindings
/var/home/zim/Sources/linux-next.git/Documentation/devicetree/bindings/arm/fsl.yaml:475:111: [warning] line too
long (113 > 110 characters) (line-length)
/var/home/zim/Sources/linux-next.git/Documentation/devicetree/bindings/arm/fsl.yaml:613:111: [warning] line too
long (113 > 110 characters) (line-length)
/var/home/zim/Sources/linux-next.git/Documentation/devicetree/bindings/arm/fsl.yaml:620:111: [warning] line too
long (113 > 110 characters) (line-length)
> Please check and re-submit.
Anyway, the V4 has this all fixed. Thanks!
On Mon, Sep 20, 2021 at 9:19 AM Marcel Ziswiler
<[email protected]> wrote:
>
> Hi Rob
>
> On Mon, 2021-09-20 at 07:28 -0500, Rob Herring wrote:
> > On Sun, 19 Sep 2021 14:55:34 +0200, Marcel Ziswiler wrote:
> > > From: Marcel Ziswiler <[email protected]>
> > >
> > > Simplify and unify the distinction between modules and carrier boards.
> > >
> > > Signed-off-by: Marcel Ziswiler <[email protected]>
> > > Acked-by: Rob Herring <[email protected]>
> > > Reviewed-by: Fabio Estevam <[email protected]>
> > >
> > > ---
> > >
> > > Changes in v3:
> > > - Add Fabio's reviewed-by. Thanks!
> > > - Add Rob's ack. Thanks!
> > >
> > > Changes in v2:
> > > - New patch cleaning-up dt-bindings documentation.
> > >
> > > .../devicetree/bindings/arm/fsl.yaml | 79 ++++++++++---------
> > > 1 file changed, 41 insertions(+), 38 deletions(-)
> > >
> >
> > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
> > on your patch (DT_CHECKER_FLAGS is new in v5.13):
> >
> > yamllint warnings/errors:
> > ./Documentation/devicetree/bindings/arm/fsl.yaml:475:111: [warning] line too long (113 > 110 characters)
> > (line-length)
> > ./Documentation/devicetree/bindings/arm/fsl.yaml:612:111: [warning] line too long (113 > 110 characters)
> > (line-length)
> >
> > dtschema/dtc warnings/errors:
> >
> > doc reference errors (make refcheckdocs):
> >
> > See https://patchwork.ozlabs.org/patch/1529833
> >
> > This check can fail if there are any dependencies. The base for a patch
> > series is generally the most recent rc1.
> >
> > If you already ran 'make dt_binding_check' and didn't see the above
> > error(s), then make sure 'yamllint' is installed and dt-schema is up to
> > date:
> >
> > pip3 install dtschema --upgrade
>
> Strange, I have done all of that but I still can not convince dt_binding_check on my system to show me that
> same yamllint warnings/errors on that fsl.yaml file. However, it otherwise seems to work as it shows dozens of
> other issues throughout Documentation/devicetree/bindings but those are not for me to fix, at least not right
> now (;-p).
You shouldn't be seeing dozens of warnings unless you are on the
current linux-next. linux-next shouldn't be the basis for your
development as that's not a tree any maintainer applies patches to.
Rob