* [PATCH v3 7/9] dt-bindings: arm: fsl: clean-up all toradex boards/modules
2021-09-19 12:55 [PATCH v3 0/9] ARM: prepare and add colibri imx6ull 1gb (emmc) support Marcel Ziswiler
@ 2021-09-19 12:55 ` Marcel Ziswiler
2021-09-20 12:28 ` Rob Herring
2021-09-19 12:55 ` [PATCH v3 8/9] ARM: dts: colibri-imx6ull-emmc: add device tree Marcel Ziswiler
2021-09-19 12:55 ` [PATCH v3 9/9] dt-bindings: arm: fsl: add toradex,colibri-imx6ull-emmc Marcel Ziswiler
2 siblings, 1 reply; 8+ messages in thread
From: Marcel Ziswiler @ 2021-09-19 12:55 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marcel Ziswiler, Rob Herring, Fabio Estevam, Frank Rowand,
Krzysztof Kozlowski, Li Yang, Oleksij Rempel, Rob Herring,
Russell King, Sascha Hauer, Shawn Guo, Stefan Riedmueller,
Tim Harvey, devicetree, linux-kernel
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Simplify and unify the distinction between modules and carrier boards.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v3 7/9] dt-bindings: arm: fsl: clean-up all toradex boards/modules
2021-09-19 12:55 ` [PATCH v3 7/9] dt-bindings: arm: fsl: clean-up all toradex boards/modules Marcel Ziswiler
@ 2021-09-20 12:28 ` Rob Herring
2021-09-20 14:19 ` Marcel Ziswiler
2021-09-20 14:53 ` Marcel Ziswiler
0 siblings, 2 replies; 8+ messages in thread
From: Rob Herring @ 2021-09-20 12:28 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: devicetree, Krzysztof Kozlowski, Li Yang, linux-arm-kernel,
Oleksij Rempel, Tim Harvey, Fabio Estevam, Rob Herring, Shawn Guo,
linux-kernel, Frank Rowand, Marcel Ziswiler, Stefan Riedmueller,
Russell King, Sascha Hauer
On Sun, 19 Sep 2021 14:55:34 +0200, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
>
> Simplify and unify the distinction between modules and carrier boards.
>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Acked-by: Rob Herring <robh@kernel.org>
> Reviewed-by: Fabio Estevam <festevam@gmail.com>
>
> ---
>
> 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.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 7/9] dt-bindings: arm: fsl: clean-up all toradex boards/modules
2021-09-20 12:28 ` Rob Herring
@ 2021-09-20 14:19 ` Marcel Ziswiler
2021-09-20 17:39 ` Rob Herring
2021-09-20 14:53 ` Marcel Ziswiler
1 sibling, 1 reply; 8+ messages in thread
From: Marcel Ziswiler @ 2021-09-20 14:19 UTC (permalink / raw)
To: robh@kernel.org
Cc: s.hauer@pengutronix.de, krzk@kernel.org, leoyang.li@nxp.com,
linux@rempel-privat.de, festevam@gmail.com,
devicetree@vger.kernel.org, s.riedmueller@phytec.de,
shawnguo@kernel.org, tharvey@gateworks.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, robh+dt@kernel.org,
frowand.list@gmail.com, linux@armlinux.org.uk
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 <marcel.ziswiler@toradex.com>
> >
> > Simplify and unify the distinction between modules and carrier boards.
> >
> > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > Acked-by: Rob Herring <robh@kernel.org>
> > Reviewed-by: Fabio Estevam <festevam@gmail.com>
> >
> > ---
> >
> > 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 7/9] dt-bindings: arm: fsl: clean-up all toradex boards/modules
2021-09-20 14:19 ` Marcel Ziswiler
@ 2021-09-20 17:39 ` Rob Herring
0 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2021-09-20 17:39 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: s.hauer@pengutronix.de, krzk@kernel.org, leoyang.li@nxp.com,
linux@rempel-privat.de, festevam@gmail.com,
devicetree@vger.kernel.org, s.riedmueller@phytec.de,
shawnguo@kernel.org, tharvey@gateworks.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, frowand.list@gmail.com,
linux@armlinux.org.uk
On Mon, Sep 20, 2021 at 9:19 AM Marcel Ziswiler
<marcel.ziswiler@toradex.com> 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 <marcel.ziswiler@toradex.com>
> > >
> > > Simplify and unify the distinction between modules and carrier boards.
> > >
> > > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > > Acked-by: Rob Herring <robh@kernel.org>
> > > Reviewed-by: Fabio Estevam <festevam@gmail.com>
> > >
> > > ---
> > >
> > > 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 7/9] dt-bindings: arm: fsl: clean-up all toradex boards/modules
2021-09-20 12:28 ` Rob Herring
2021-09-20 14:19 ` Marcel Ziswiler
@ 2021-09-20 14:53 ` Marcel Ziswiler
1 sibling, 0 replies; 8+ messages in thread
From: Marcel Ziswiler @ 2021-09-20 14:53 UTC (permalink / raw)
To: robh@kernel.org
Cc: s.hauer@pengutronix.de, krzk@kernel.org, leoyang.li@nxp.com,
linux@rempel-privat.de, festevam@gmail.com,
devicetree@vger.kernel.org, s.riedmueller@phytec.de,
shawnguo@kernel.org, tharvey@gateworks.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, robh+dt@kernel.org,
frowand.list@gmail.com, linux@armlinux.org.uk
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 <marcel.ziswiler@toradex.com>
> >
> > Simplify and unify the distinction between modules and carrier boards.
> >
> > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > Acked-by: Rob Herring <robh@kernel.org>
> > Reviewed-by: Fabio Estevam <festevam@gmail.com>
> >
> > ---
> >
> > 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!
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 8/9] ARM: dts: colibri-imx6ull-emmc: add device tree
2021-09-19 12:55 [PATCH v3 0/9] ARM: prepare and add colibri imx6ull 1gb (emmc) support Marcel Ziswiler
2021-09-19 12:55 ` [PATCH v3 7/9] dt-bindings: arm: fsl: clean-up all toradex boards/modules Marcel Ziswiler
@ 2021-09-19 12:55 ` Marcel Ziswiler
2021-09-19 12:55 ` [PATCH v3 9/9] dt-bindings: arm: fsl: add toradex,colibri-imx6ull-emmc Marcel Ziswiler
2 siblings, 0 replies; 8+ messages in thread
From: Marcel Ziswiler @ 2021-09-19 12:55 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Max Krummenacher, Marcel Ziswiler, Fabio Estevam, Arnd Bergmann,
Frank Rowand, NXP Linux Team, Olof Johansson,
Pengutronix Kernel Team, Rob Herring, Russell King, Sascha Hauer,
Shawn Guo, devicetree, linux-kernel, soc
From: Max Krummenacher <max.krummenacher@toradex.com>
Add a device tree for a Colibri iMX6ULL 1GB which has a eMMC instead of
the raw NAND used on other SKUs.
Related-to: ELB-4056, ELB-4058, ELB-4070
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
---
Changes in v3:
- Add Fabio's reviewed-by. Thanks!
Changes in v2:
- Fix indentation.
- Use latest agreed upon SPDX-License-Identifier GPL-2.0+ OR MIT.
- Drop AG in our copyright statement as recommended by our legal.
arch/arm/boot/dts/Makefile | 1 +
.../boot/dts/imx6ull-colibri-emmc-eval-v3.dts | 17 ++
.../dts/imx6ull-colibri-emmc-nonwifi.dtsi | 185 ++++++++++++++++++
arch/arm/boot/dts/imx6ull-colibri.dtsi | 32 ++-
4 files changed, 233 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts
create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d17210efe374f..8fb1429a7fb80 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -674,6 +674,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ul-tx6ul-0011.dtb \
imx6ul-tx6ul-mainboard.dtb \
imx6ull-14x14-evk.dtb \
+ imx6ull-colibri-emmc-eval-v3.dtb \
imx6ull-colibri-eval-v3.dtb \
imx6ull-colibri-wifi-eval-v3.dtb \
imx6ull-myir-mys-6ulx-eval.dtb \
diff --git a/arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts b/arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts
new file mode 100644
index 0000000000000..61b93cb040c7f
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * Copyright 2021 Toradex
+ */
+
+/dts-v1/;
+
+#include "imx6ull-colibri-emmc-nonwifi.dtsi"
+#include "imx6ull-colibri-eval-v3.dtsi"
+
+/ {
+ model = "Toradex Colibri iMX6ULL 1GB (eMMC) on Colibri Evaluation Board V3";
+ compatible = "toradex,colibri-imx6ull-emmc-eval",
+ "toradex,colibri-imx6ull-emmc",
+ "toradex,colibri-imx6ull",
+ "fsl,imx6ull";
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi
new file mode 100644
index 0000000000000..a099abfdfa27c
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi
@@ -0,0 +1,185 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * Copyright 2021 Toradex
+ */
+
+#include "imx6ull-colibri.dtsi"
+
+/ {
+ aliases {
+ mmc0 = &usdhc2; /* eMMC */
+ mmc1 = &usdhc1; /* MMC 4bit slot */
+ };
+
+ memory@80000000 {
+ device_type = "memory";
+ reg = <0x80000000 0x10000000>;
+ };
+};
+
+&gpio1 {
+ gpio-line-names = "SODIMM_8",
+ "SODIMM_6",
+ "SODIMM_129",
+ "SODIMM_89",
+ "SODIMM_19",
+ "SODIMM_21",
+ "UNUSABLE_SODIMM_180",
+ "UNUSABLE_SODIMM_184",
+ "SODIMM_4",
+ "SODIMM_2",
+ "SODIMM_106",
+ "SODIMM_71",
+ "SODIMM_23",
+ "SODIMM_31",
+ "SODIMM_99",
+ "SODIMM_102",
+ "SODIMM_33",
+ "SODIMM_35",
+ "SODIMM_25",
+ "SODIMM_27",
+ "SODIMM_36",
+ "SODIMM_38",
+ "SODIMM_32",
+ "SODIMM_34",
+ "SODIMM_135",
+ "SODIMM_77",
+ "SODIMM_100",
+ "SODIMM_186",
+ "SODIMM_196",
+ "SODIMM_194";
+};
+
+&gpio2 {
+ gpio-line-names = "SODIMM_55",
+ "SODIMM_63",
+ "SODIMM_178",
+ "SODIMM_188",
+ "SODIMM_73",
+ "SODIMM_30",
+ "SODIMM_67",
+ "SODIMM_104",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "SODIMM_190",
+ "SODIMM_47",
+ "SODIMM_192",
+ "SODIMM_49",
+ "SODIMM_51",
+ "SODIMM_53";
+};
+
+&gpio3 {
+ gpio-line-names = "SODIMM_56",
+ "SODIMM_44",
+ "SODIMM_68",
+ "SODIMM_82",
+ "",
+ "SODIMM_76",
+ "SODIMM_70",
+ "SODIMM_60",
+ "SODIMM_58",
+ "SODIMM_78",
+ "SODIMM_72",
+ "SODIMM_80",
+ "SODIMM_46",
+ "SODIMM_62",
+ "SODIMM_48",
+ "SODIMM_74",
+ "SODIMM_50",
+ "SODIMM_52",
+ "SODIMM_54",
+ "SODIMM_66",
+ "SODIMM_64",
+ "SODIMM_57",
+ "SODIMM_61",
+ "SODIMM_29",
+ "SODIMM_37",
+ "SODIMM_88",
+ "SODIMM_86",
+ "SODIMM_92",
+ "SODIMM_90";
+};
+
+&gpio4 {
+ gpio-line-names = "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "SODIMM_140",
+ "SODIMM_59",
+ "SODIMM_142",
+ "SODIMM_144",
+ "SODIMM_133",
+ "SODIMM_146",
+ "SODIMM_28",
+ "SODIMM_75",
+ "SODIMM_96",
+ "SODIMM_81",
+ "SODIMM_94",
+ "SODIMM_101",
+ "SODIMM_103",
+ "SODIMM_79",
+ "SODIMM_97",
+ "SODIMM_69",
+ "SODIMM_98",
+ "SODIMM_85",
+ "SODIMM_65";
+};
+
+&gpio5 {
+ gpio-line-names = "SODIMM_43",
+ "SODIMM_45",
+ "SODIMM_137",
+ "SODIMM_95",
+ "SODIMM_107",
+ "SODIMM_131",
+ "SODIMM_93",
+ "",
+ "SODIMM_138",
+ "",
+ "SODIMM_105",
+ "SODIMM_127";
+};
+
+&gpmi {
+ status = "disabled";
+};
+
+&iomuxc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3
+ &pinctrl_gpio4 &pinctrl_gpio6 &pinctrl_gpio7
+ &pinctrl_gpmi_gpio>;
+};
+
+&iomuxc_snvs {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio3>;
+};
+
+&usdhc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc2emmc>;
+ assigned-clocks = <&clks IMX6UL_CLK_USDHC2_SEL>, <&clks IMX6UL_CLK_USDHC2>;
+ assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>;
+ assigned-clock-rates = <0>, <198000000>;
+ bus-width = <8>;
+ keep-power-in-suspend;
+ no-1-8-v;
+ non-removable;
+ vmmc-supply = <®_module_3v3>;
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
index 0cdbf7b6e7285..7f35a06dff95b 100644
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
/*
- * Copyright 2018 Toradex AG
+ * Copyright 2018-2021 Toradex
*/
#include "imx6ull.dtsi"
@@ -345,6 +345,19 @@ MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01 0xb0b0 /* SODIMM 63 */
>;
};
+ /*
+ * With an eMMC instead of a raw NAND device the following pins
+ * are available at SODIMM pins
+ */
+ pinctrl_gpmi_gpio: gpmi-gpio-grp {
+ fsl,pins = <
+ MX6UL_PAD_NAND_ALE__GPIO4_IO10 0x10b0 /* SODIMM 140 */
+ MX6UL_PAD_NAND_CE0_B__GPIO4_IO13 0x10b0 /* SODIMM 144 */
+ MX6UL_PAD_NAND_CLE__GPIO4_IO15 0x10b0 /* SODIMM 146 */
+ MX6UL_PAD_NAND_READY_B__GPIO4_IO12 0x10b0 /* SODIMM 142 */
+ >;
+ };
+
pinctrl_gpmi_nand: gpmi-nand-grp {
fsl,pins = <
MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0x100a9
@@ -533,6 +546,21 @@ MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT 0x10
>;
};
+ pinctrl_usdhc2emmc: usdhc2emmcgrp {
+ fsl,pins = <
+ MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x17059
+ MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059
+ MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059
+ MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059
+ MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059
+ MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059
+ MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059
+ MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059
+ MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059
+ MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059
+ >;
+ };
+
pinctrl_wdog: wdog-grp {
fsl,pins = <
MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY 0x30b0
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v3 9/9] dt-bindings: arm: fsl: add toradex,colibri-imx6ull-emmc
2021-09-19 12:55 [PATCH v3 0/9] ARM: prepare and add colibri imx6ull 1gb (emmc) support Marcel Ziswiler
2021-09-19 12:55 ` [PATCH v3 7/9] dt-bindings: arm: fsl: clean-up all toradex boards/modules Marcel Ziswiler
2021-09-19 12:55 ` [PATCH v3 8/9] ARM: dts: colibri-imx6ull-emmc: add device tree Marcel Ziswiler
@ 2021-09-19 12:55 ` Marcel Ziswiler
2 siblings, 0 replies; 8+ messages in thread
From: Marcel Ziswiler @ 2021-09-19 12:55 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marcel Ziswiler, Rob Herring, Fabio Estevam, Frank Rowand,
Krzysztof Kozlowski, Li Yang, Oleksij Rempel, Rob Herring,
Russell King, Sascha Hauer, Shawn Guo, Stefan Riedmueller,
Tim Harvey, devicetree, linux-kernel
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Add toradex,colibri-imx6ull-emmc for our new Colibri iMX6ULL 1GB (eMMC)
Module and the carrier boards (so far only Colibri Evaluation Board) it
may be mated in.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
---
Changes in v3:
- Add Rob's ack. Thanks!
- Add Fabio's reviewed-by. Thanks!
Changes in v2:
- New patch documenting dt-bindings.
Documentation/devicetree/bindings/arm/fsl.yaml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml
index a95314bd271c7..32e2d5537210b 100644
--- a/Documentation/devicetree/bindings/arm/fsl.yaml
+++ b/Documentation/devicetree/bindings/arm/fsl.yaml
@@ -581,6 +581,7 @@ properties:
- kontron,imx6ull-n6411-som # Kontron N6411 SOM
- myir,imx6ull-mys-6ulx-eval # MYiR Tech iMX6ULL Evaluation Board
- toradex,colibri-imx6ull # Colibri iMX6ULL Modules
+ - toradex,colibri-imx6ull-emmc # Colibri iMX6ULL 1GB (eMMC) Module
- toradex,colibri-imx6ull-wifi # Colibri iMX6ULL Wi-Fi / BT Modules
- const: fsl,imx6ull
@@ -606,6 +607,13 @@ properties:
- const: toradex,colibri-imx6ull # Colibri iMX6ULL Module
- const: fsl,imx6dl
+ - description: i.MX6ULL Boards with Toradex Colibri iMX6ULL 1GB (eMMC) Module
+ items:
+ - enum:
+ - toradex,colibri-imx6ull-emmc-eval # Colibri iMX6ULL 1GB (eMMC) Module on Colibri Evaluation Board
+ - const: toradex,colibri-imx6ull-emmc # Colibri iMX6ULL 1GB (eMMC) Module
+ - const: fsl,imx6dl
+
- description: i.MX6ULL Boards with Toradex Colibri iMX6ULL Wi-Fi / BT Modules
items:
- enum:
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread