diff mbox series

[v2,2/2] ARM: dts: imx6q: Add Variscite MX6 Custom board support

Message ID 20230719224141.3716815-2-james.hilliard1@gmail.com
State Changes Requested, archived
Headers show
Series None | expand

Checks

Context Check Description
robh/checkpatch warning total: 0 errors, 3 warnings, 293 lines checked
robh/patch-applied success
robh/dtbs-check warning build log
robh/dt-meta-schema success

Commit Message

James Hilliard July 19, 2023, 10:41 p.m. UTC
This patch adds support for the Variscite MX6 SoM Carrier Board.

This Carrier-Board has the following :
- LVDS interface for the VLCD-CAP-GLD-LVDS 7" LCD 800 x 480 touch display
- HDMI Connector
- USB Host + USB OTG Connector
- 10/100/1000 Mbps Ethernet
- miniPCI-Express slot
- SD Card connector
- Audio Headphone/Line In jack connectors
- S-ATA
- On-board DMIC
- RS485 Header
- CAN bus header
- SPI header
- Camera Interfaces header
- OnBoard RTC with Coin Backup battery socket
- RS232 Debug Header (IDC10)
- RS232 DTE

Product Page : https://www.variscite.com/product/single-board-computers/var-mx6customboard

The dts file based on the ones provided by Variscite on their own
kernel, but adapted for mainline.

Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 .../devicetree/bindings/arm/fsl.yaml          |   1 +
 arch/arm/boot/dts/Makefile                    |   1 +
 .../arm/boot/dts/imx6q-var-mx6customboard.dts | 279 ++++++++++++++++++
 3 files changed, 281 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx6q-var-mx6customboard.dts

Comments

Krzysztof Kozlowski July 20, 2023, 6:15 a.m. UTC | #1
On 20/07/2023 00:41, James Hilliard wrote:
> This patch adds support for the Variscite MX6 SoM Carrier Board.
> 
> This Carrier-Board has the following :
> - LVDS interface for the VLCD-CAP-GLD-LVDS 7" LCD 800 x 480 touch display
> - HDMI Connector
> - USB Host + USB OTG Connector
> - 10/100/1000 Mbps Ethernet
> - miniPCI-Express slot
> - SD Card connector
> - Audio Headphone/Line In jack connectors
> - S-ATA
> - On-board DMIC
> - RS485 Header
> - CAN bus header
> - SPI header
> - Camera Interfaces header
> - OnBoard RTC with Coin Backup battery socket
> - RS232 Debug Header (IDC10)
> - RS232 DTE
> 
> Product Page : https://www.variscite.com/product/single-board-computers/var-mx6customboard
> 
> The dts file based on the ones provided by Variscite on their own
> kernel, but adapted for mainline.
> 
> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  .../devicetree/bindings/arm/fsl.yaml          |   1 +

Please run scripts/checkpatch.pl and fix reported warnings. Some
warnings can be ignored, but the code here looks like it needs a fix.
Feel free to get in touch if the warning is not clear.

>  arch/arm/boot/dts/Makefile                    |   1 +
>  .../arm/boot/dts/imx6q-var-mx6customboard.dts | 279 ++++++++++++++++++
>  3 files changed, 281 insertions(+)
>  create mode 100644 arch/arm/boot/dts/imx6q-var-mx6customboard.dts
> 
> diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml
> index 15d411084065..0f583852de8a 100644
> --- a/Documentation/devicetree/bindings/arm/fsl.yaml
> +++ b/Documentation/devicetree/bindings/arm/fsl.yaml
> @@ -298,6 +298,7 @@ properties:
>                - udoo,imx6q-udoo           # Udoo i.MX6 Quad Board
>                - uniwest,imx6q-evi         # Uniwest Evi
>                - variscite,dt6customboard
> +              - variscite,mx6customboard
>                - wand,imx6q-wandboard      # Wandboard i.MX6 Quad Board
>                - ysoft,imx6q-yapp4-crux    # i.MX6 Quad Y Soft IOTA Crux board
>                - ysoft,imx6q-yapp4-pegasus # i.MX6 Quad Y Soft IOTA Pegasus board
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 59829fc90315..9cfc3d3e91ea 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -665,6 +665,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
>  	imx6q-udoo.dtb \
>  	imx6q-utilite-pro.dtb \
>  	imx6q-var-dt6customboard.dtb \
> +	imx6q-var-mx6customboard.dtb \
>  	imx6q-vicut1.dtb \
>  	imx6q-wandboard.dtb \
>  	imx6q-wandboard-revb1.dtb \
> diff --git a/arch/arm/boot/dts/imx6q-var-mx6customboard.dts b/arch/arm/boot/dts/imx6q-var-mx6customboard.dts
> new file mode 100644
> index 000000000000..66047dff11ec
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx6q-var-mx6customboard.dts
> @@ -0,0 +1,279 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Support for Variscite MX6 Carrier-board
> + *
> + * Copyright 2016 Variscite, Ltd. All Rights Reserved
> + * Copyright 2022 Bootlin
> + */
> +
> +/dts-v1/;
> +
> +#include "imx6qdl-var-som.dtsi"
> +#include <dt-bindings/pwm/pwm.h>
> +
> +/ {
> +	model = "Variscite i.MX6 QUAD/DUAL VAR-SOM-MX6 Custom Board";
> +	compatible = "variscite,mx6customboard", "fsl,imx6q";

Where is the SoM compatible?

Best regards,
Krzysztof
James Hilliard July 20, 2023, 10:49 a.m. UTC | #2
On Thu, Jul 20, 2023 at 12:15 AM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> On 20/07/2023 00:41, James Hilliard wrote:
> > This patch adds support for the Variscite MX6 SoM Carrier Board.
> >
> > This Carrier-Board has the following :
> > - LVDS interface for the VLCD-CAP-GLD-LVDS 7" LCD 800 x 480 touch display
> > - HDMI Connector
> > - USB Host + USB OTG Connector
> > - 10/100/1000 Mbps Ethernet
> > - miniPCI-Express slot
> > - SD Card connector
> > - Audio Headphone/Line In jack connectors
> > - S-ATA
> > - On-board DMIC
> > - RS485 Header
> > - CAN bus header
> > - SPI header
> > - Camera Interfaces header
> > - OnBoard RTC with Coin Backup battery socket
> > - RS232 Debug Header (IDC10)
> > - RS232 DTE
> >
> > Product Page : https://www.variscite.com/product/single-board-computers/var-mx6customboard
> >
> > The dts file based on the ones provided by Variscite on their own
> > kernel, but adapted for mainline.
> >
> > Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
> > Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> > ---
> >  .../devicetree/bindings/arm/fsl.yaml          |   1 +
>
> Please run scripts/checkpatch.pl and fix reported warnings. Some
> warnings can be ignored, but the code here looks like it needs a fix.
> Feel free to get in touch if the warning is not clear.
>
> >  arch/arm/boot/dts/Makefile                    |   1 +
> >  .../arm/boot/dts/imx6q-var-mx6customboard.dts | 279 ++++++++++++++++++
> >  3 files changed, 281 insertions(+)
> >  create mode 100644 arch/arm/boot/dts/imx6q-var-mx6customboard.dts
> >
> > diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml
> > index 15d411084065..0f583852de8a 100644
> > --- a/Documentation/devicetree/bindings/arm/fsl.yaml
> > +++ b/Documentation/devicetree/bindings/arm/fsl.yaml
> > @@ -298,6 +298,7 @@ properties:
> >                - udoo,imx6q-udoo           # Udoo i.MX6 Quad Board
> >                - uniwest,imx6q-evi         # Uniwest Evi
> >                - variscite,dt6customboard
> > +              - variscite,mx6customboard
> >                - wand,imx6q-wandboard      # Wandboard i.MX6 Quad Board
> >                - ysoft,imx6q-yapp4-crux    # i.MX6 Quad Y Soft IOTA Crux board
> >                - ysoft,imx6q-yapp4-pegasus # i.MX6 Quad Y Soft IOTA Pegasus board
> > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> > index 59829fc90315..9cfc3d3e91ea 100644
> > --- a/arch/arm/boot/dts/Makefile
> > +++ b/arch/arm/boot/dts/Makefile
> > @@ -665,6 +665,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
> >       imx6q-udoo.dtb \
> >       imx6q-utilite-pro.dtb \
> >       imx6q-var-dt6customboard.dtb \
> > +     imx6q-var-mx6customboard.dtb \
> >       imx6q-vicut1.dtb \
> >       imx6q-wandboard.dtb \
> >       imx6q-wandboard-revb1.dtb \
> > diff --git a/arch/arm/boot/dts/imx6q-var-mx6customboard.dts b/arch/arm/boot/dts/imx6q-var-mx6customboard.dts
> > new file mode 100644
> > index 000000000000..66047dff11ec
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/imx6q-var-mx6customboard.dts
> > @@ -0,0 +1,279 @@
> > +// SPDX-License-Identifier: GPL-2.0+
> > +/*
> > + * Support for Variscite MX6 Carrier-board
> > + *
> > + * Copyright 2016 Variscite, Ltd. All Rights Reserved
> > + * Copyright 2022 Bootlin
> > + */
> > +
> > +/dts-v1/;
> > +
> > +#include "imx6qdl-var-som.dtsi"
> > +#include <dt-bindings/pwm/pwm.h>
> > +
> > +/ {
> > +     model = "Variscite i.MX6 QUAD/DUAL VAR-SOM-MX6 Custom Board";
> > +     compatible = "variscite,mx6customboard", "fsl,imx6q";
>
> Where is the SoM compatible?

I mostly just copied this from the DART-MX6 device tree which is
another variscite
imx6q based modular SoM custom board combination:
https://github.com/torvalds/linux/blob/v6.5-rc2/arch/arm/boot/dts/nxp/imx/imx6q-var-dt6customboard.dts#L17

The terminology is a bit confusing in general here, variscite has 2
families of pin2pin
modules, the "VAR-SOM" and the "DART" family.
https://www.variscite.com/variscite-pin2pin-system-on-module-families/

Within each connector family there are then multiple SoM boards that
can be used with the same carrier boards(ie the Custom Board carrier board
like the evaluation kit) although they are often bundled together with specific
boards in practice.

So the existing DART-MX6 I think uses the same SoC but is in a different
family and as such has a different carrier board. However as the relation
between the SoM and the carrier board is effectively the same, I just copied
the way compatibile is being set there for the VAR-SOM-MX6 from the
existing DART-MX6 custom board device tree.

I think this roughly represents the SoM board device tree associations as I'm
understanding them:

pin2pin Family: DART
SoM: https://www.variscite.com/product/system-on-module-som/cortex-a9/dart-mx6-cpu-freescale-imx6/
SoM part: DART-MX6
SoM device tree: imx6qdl-var-dart.dtsi
SoM SoC: imx6q
Board: https://www.variscite.com/product/single-board-computers/dt6customboard/
Board device tree: imx6q-var-dt6customboard.dts
Board compatible: compatible = "variscite,dt6customboard", "fsl,imx6q";

pin2pin Family: VAR-SOM
SoM: https://www.variscite.com/product/system-on-module-som/cortex-a9/var-som-mx6-cpu-freescale-imx6/
SoM part: VAR-SOM-MX6
SoM device tree: imx6qdl-var-som.dtsi
SoM SoC: imx6q
Board: mx6customboard
https://www.variscite.com/product/single-board-computers/var-mx6customboard/
Board device tree: imx6q-var-mx6customboard.dts
Board compatible: compatible = "variscite,mx6customboard", "fsl,imx6q";

What's confusing here is that the DART-MX6 is also described as a SoM:
"DART-MX6 from Variscite is the smallest System on Module (SoM) / Computer
on Module (CoM) supporting NXP/Freescale’s i.MX6 Quad and Dual-core
Cortex-A9™ processor"

So we have a "DART-MX6" SoM part which corresponds to the "VAR-SOM-MX6"
SoM part, with both being SoM's but only one("VAR-SOM-MX6") having SoM in
the actual part name.

Does the compatible section for imx6qdl-var-dart.dtsi look correct?

I'm not sure what exactly a "SoM compatible" should look like here as SoM is
both a generic term(used to describe by both the "DART-MX6" and
"VAR-SOM-MX6" parts) as well as term used within a part(used in the
part for "VAR-SOM-MX6" as well as other SoM's in the "VAR-SOM" family
but not the "DART-MX6" part or other SoM's in the "DART" family).

>
> Best regards,
> Krzysztof
>
Krzysztof Kozlowski July 20, 2023, 11:39 a.m. UTC | #3
On 20/07/2023 12:49, James Hilliard wrote:
> On Thu, Jul 20, 2023 at 12:15 AM Krzysztof Kozlowski
> <krzysztof.kozlowski@linaro.org> wrote:
>>
>> On 20/07/2023 00:41, James Hilliard wrote:
>>> This patch adds support for the Variscite MX6 SoM Carrier Board.
>>>
>>> This Carrier-Board has the following :
>>> - LVDS interface for the VLCD-CAP-GLD-LVDS 7" LCD 800 x 480 touch display
>>> - HDMI Connector
>>> - USB Host + USB OTG Connector
>>> - 10/100/1000 Mbps Ethernet
>>> - miniPCI-Express slot
>>> - SD Card connector
>>> - Audio Headphone/Line In jack connectors
>>> - S-ATA
>>> - On-board DMIC
>>> - RS485 Header
>>> - CAN bus header
>>> - SPI header
>>> - Camera Interfaces header
>>> - OnBoard RTC with Coin Backup battery socket
>>> - RS232 Debug Header (IDC10)
>>> - RS232 DTE
>>>
>>> Product Page : https://www.variscite.com/product/single-board-computers/var-mx6customboard
>>>
>>> The dts file based on the ones provided by Variscite on their own
>>> kernel, but adapted for mainline.
>>>
>>> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
>>> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
>>> ---
>>>  .../devicetree/bindings/arm/fsl.yaml          |   1 +
>>
>> Please run scripts/checkpatch.pl and fix reported warnings. Some
>> warnings can be ignored, but the code here looks like it needs a fix.
>> Feel free to get in touch if the warning is not clear.
>>
>>>  arch/arm/boot/dts/Makefile                    |   1 +
>>>  .../arm/boot/dts/imx6q-var-mx6customboard.dts | 279 ++++++++++++++++++
>>>  3 files changed, 281 insertions(+)
>>>  create mode 100644 arch/arm/boot/dts/imx6q-var-mx6customboard.dts
>>>
>>> diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml
>>> index 15d411084065..0f583852de8a 100644
>>> --- a/Documentation/devicetree/bindings/arm/fsl.yaml
>>> +++ b/Documentation/devicetree/bindings/arm/fsl.yaml
>>> @@ -298,6 +298,7 @@ properties:
>>>                - udoo,imx6q-udoo           # Udoo i.MX6 Quad Board
>>>                - uniwest,imx6q-evi         # Uniwest Evi
>>>                - variscite,dt6customboard
>>> +              - variscite,mx6customboard
>>>                - wand,imx6q-wandboard      # Wandboard i.MX6 Quad Board
>>>                - ysoft,imx6q-yapp4-crux    # i.MX6 Quad Y Soft IOTA Crux board
>>>                - ysoft,imx6q-yapp4-pegasus # i.MX6 Quad Y Soft IOTA Pegasus board
>>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>>> index 59829fc90315..9cfc3d3e91ea 100644
>>> --- a/arch/arm/boot/dts/Makefile
>>> +++ b/arch/arm/boot/dts/Makefile
>>> @@ -665,6 +665,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
>>>       imx6q-udoo.dtb \
>>>       imx6q-utilite-pro.dtb \
>>>       imx6q-var-dt6customboard.dtb \
>>> +     imx6q-var-mx6customboard.dtb \
>>>       imx6q-vicut1.dtb \
>>>       imx6q-wandboard.dtb \
>>>       imx6q-wandboard-revb1.dtb \
>>> diff --git a/arch/arm/boot/dts/imx6q-var-mx6customboard.dts b/arch/arm/boot/dts/imx6q-var-mx6customboard.dts
>>> new file mode 100644
>>> index 000000000000..66047dff11ec
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/imx6q-var-mx6customboard.dts
>>> @@ -0,0 +1,279 @@
>>> +// SPDX-License-Identifier: GPL-2.0+
>>> +/*
>>> + * Support for Variscite MX6 Carrier-board
>>> + *
>>> + * Copyright 2016 Variscite, Ltd. All Rights Reserved
>>> + * Copyright 2022 Bootlin
>>> + */
>>> +
>>> +/dts-v1/;
>>> +
>>> +#include "imx6qdl-var-som.dtsi"
>>> +#include <dt-bindings/pwm/pwm.h>
>>> +
>>> +/ {
>>> +     model = "Variscite i.MX6 QUAD/DUAL VAR-SOM-MX6 Custom Board";
>>> +     compatible = "variscite,mx6customboard", "fsl,imx6q";
>>
>> Where is the SoM compatible?
> 
> I mostly just copied this from the DART-MX6 device tree which is
> another variscite
> imx6q based modular SoM custom board combination:
> https://github.com/torvalds/linux/blob/v6.5-rc2/arch/arm/boot/dts/nxp/imx/imx6q-var-dt6customboard.dts#L17
> 
> The terminology is a bit confusing in general here, variscite has 2
> families of pin2pin
> modules, the "VAR-SOM" and the "DART" family.
> https://www.variscite.com/variscite-pin2pin-system-on-module-families/

I know, I am familiar with them.


> 
> Within each connector family there are then multiple SoM boards that
> can be used with the same carrier boards(ie the Custom Board carrier board
> like the evaluation kit) although they are often bundled together with specific
> boards in practice.

No, they are being shipped to the customers which then use them in their
products. Having common compatible can be useful, although it depends
what's in the common part. For example for IMX8 it was quite a lot, thus
it made sense.

> 
> So the existing DART-MX6 I think uses the same SoC but is in a different
> family and as such has a different carrier board. However as the relation
> between the SoM and the carrier board is effectively the same, I just copied
> the way compatibile is being set there for the VAR-SOM-MX6 from the
> existing DART-MX6 custom board device tree.
> 
> I think this roughly represents the SoM board device tree associations as I'm
> understanding them:
> 
> pin2pin Family: DART
> SoM: https://www.variscite.com/product/system-on-module-som/cortex-a9/dart-mx6-cpu-freescale-imx6/
> SoM part: DART-MX6
> SoM device tree: imx6qdl-var-dart.dtsi
> SoM SoC: imx6q
> Board: https://www.variscite.com/product/single-board-computers/dt6customboard/
> Board device tree: imx6q-var-dt6customboard.dts
> Board compatible: compatible = "variscite,dt6customboard", "fsl,imx6q";
> 
> pin2pin Family: VAR-SOM
> SoM: https://www.variscite.com/product/system-on-module-som/cortex-a9/var-som-mx6-cpu-freescale-imx6/
> SoM part: VAR-SOM-MX6
> SoM device tree: imx6qdl-var-som.dtsi
> SoM SoC: imx6q
> Board: mx6customboard
> https://www.variscite.com/product/single-board-computers/var-mx6customboard/
> Board device tree: imx6q-var-mx6customboard.dts
> Board compatible: compatible = "variscite,mx6customboard", "fsl,imx6q";
> 
> What's confusing here is that the DART-MX6 is also described as a SoM:
> "DART-MX6 from Variscite is the smallest System on Module (SoM) / Computer
> on Module (CoM) supporting NXP/Freescale’s i.MX6 Quad and Dual-core
> Cortex-A9™ processor"

It is not confusing. It is a SoM.

> 
> So we have a "DART-MX6" SoM part which corresponds to the "VAR-SOM-MX6"
> SoM part, with both being SoM's but only one("VAR-SOM-MX6") having SoM in
> the actual part name.

Vendor naming is one thing, but true meaning is second. These are
System-on-Modules.

> 
> Does the compatible section for imx6qdl-var-dart.dtsi look correct?
> 
> I'm not sure what exactly a "SoM compatible" should look like here as SoM is
> both a generic term(used to describe by both the "DART-MX6" and
> "VAR-SOM-MX6" parts) as well as term used within a part(used in the
> part for "VAR-SOM-MX6" as well as other SoM's in the "VAR-SOM" family
> but not the "DART-MX6" part or other SoM's in the "DART" family).

Take a look at IMX8 Variscite SoMs.

Best regards,
Krzysztof
James Hilliard July 20, 2023, 12:22 p.m. UTC | #4
On Thu, Jul 20, 2023 at 5:39 AM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> On 20/07/2023 12:49, James Hilliard wrote:
> > On Thu, Jul 20, 2023 at 12:15 AM Krzysztof Kozlowski
> > <krzysztof.kozlowski@linaro.org> wrote:
> >>
> >> On 20/07/2023 00:41, James Hilliard wrote:
> >>> This patch adds support for the Variscite MX6 SoM Carrier Board.
> >>>
> >>> This Carrier-Board has the following :
> >>> - LVDS interface for the VLCD-CAP-GLD-LVDS 7" LCD 800 x 480 touch display
> >>> - HDMI Connector
> >>> - USB Host + USB OTG Connector
> >>> - 10/100/1000 Mbps Ethernet
> >>> - miniPCI-Express slot
> >>> - SD Card connector
> >>> - Audio Headphone/Line In jack connectors
> >>> - S-ATA
> >>> - On-board DMIC
> >>> - RS485 Header
> >>> - CAN bus header
> >>> - SPI header
> >>> - Camera Interfaces header
> >>> - OnBoard RTC with Coin Backup battery socket
> >>> - RS232 Debug Header (IDC10)
> >>> - RS232 DTE
> >>>
> >>> Product Page : https://www.variscite.com/product/single-board-computers/var-mx6customboard
> >>>
> >>> The dts file based on the ones provided by Variscite on their own
> >>> kernel, but adapted for mainline.
> >>>
> >>> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
> >>> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> >>> ---
> >>>  .../devicetree/bindings/arm/fsl.yaml          |   1 +
> >>
> >> Please run scripts/checkpatch.pl and fix reported warnings. Some
> >> warnings can be ignored, but the code here looks like it needs a fix.
> >> Feel free to get in touch if the warning is not clear.
> >>
> >>>  arch/arm/boot/dts/Makefile                    |   1 +
> >>>  .../arm/boot/dts/imx6q-var-mx6customboard.dts | 279 ++++++++++++++++++
> >>>  3 files changed, 281 insertions(+)
> >>>  create mode 100644 arch/arm/boot/dts/imx6q-var-mx6customboard.dts
> >>>
> >>> diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml
> >>> index 15d411084065..0f583852de8a 100644
> >>> --- a/Documentation/devicetree/bindings/arm/fsl.yaml
> >>> +++ b/Documentation/devicetree/bindings/arm/fsl.yaml
> >>> @@ -298,6 +298,7 @@ properties:
> >>>                - udoo,imx6q-udoo           # Udoo i.MX6 Quad Board
> >>>                - uniwest,imx6q-evi         # Uniwest Evi
> >>>                - variscite,dt6customboard
> >>> +              - variscite,mx6customboard
> >>>                - wand,imx6q-wandboard      # Wandboard i.MX6 Quad Board
> >>>                - ysoft,imx6q-yapp4-crux    # i.MX6 Quad Y Soft IOTA Crux board
> >>>                - ysoft,imx6q-yapp4-pegasus # i.MX6 Quad Y Soft IOTA Pegasus board
> >>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> >>> index 59829fc90315..9cfc3d3e91ea 100644
> >>> --- a/arch/arm/boot/dts/Makefile
> >>> +++ b/arch/arm/boot/dts/Makefile
> >>> @@ -665,6 +665,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
> >>>       imx6q-udoo.dtb \
> >>>       imx6q-utilite-pro.dtb \
> >>>       imx6q-var-dt6customboard.dtb \
> >>> +     imx6q-var-mx6customboard.dtb \
> >>>       imx6q-vicut1.dtb \
> >>>       imx6q-wandboard.dtb \
> >>>       imx6q-wandboard-revb1.dtb \
> >>> diff --git a/arch/arm/boot/dts/imx6q-var-mx6customboard.dts b/arch/arm/boot/dts/imx6q-var-mx6customboard.dts
> >>> new file mode 100644
> >>> index 000000000000..66047dff11ec
> >>> --- /dev/null
> >>> +++ b/arch/arm/boot/dts/imx6q-var-mx6customboard.dts
> >>> @@ -0,0 +1,279 @@
> >>> +// SPDX-License-Identifier: GPL-2.0+
> >>> +/*
> >>> + * Support for Variscite MX6 Carrier-board
> >>> + *
> >>> + * Copyright 2016 Variscite, Ltd. All Rights Reserved
> >>> + * Copyright 2022 Bootlin
> >>> + */
> >>> +
> >>> +/dts-v1/;
> >>> +
> >>> +#include "imx6qdl-var-som.dtsi"
> >>> +#include <dt-bindings/pwm/pwm.h>
> >>> +
> >>> +/ {
> >>> +     model = "Variscite i.MX6 QUAD/DUAL VAR-SOM-MX6 Custom Board";
> >>> +     compatible = "variscite,mx6customboard", "fsl,imx6q";
> >>
> >> Where is the SoM compatible?
> >
> > I mostly just copied this from the DART-MX6 device tree which is
> > another variscite
> > imx6q based modular SoM custom board combination:
> > https://github.com/torvalds/linux/blob/v6.5-rc2/arch/arm/boot/dts/nxp/imx/imx6q-var-dt6customboard.dts#L17
> >
> > The terminology is a bit confusing in general here, variscite has 2
> > families of pin2pin
> > modules, the "VAR-SOM" and the "DART" family.
> > https://www.variscite.com/variscite-pin2pin-system-on-module-families/
>
> I know, I am familiar with them.
>
>
> >
> > Within each connector family there are then multiple SoM boards that
> > can be used with the same carrier boards(ie the Custom Board carrier board
> > like the evaluation kit) although they are often bundled together with specific
> > boards in practice.
>
> No, they are being shipped to the customers which then use them in their
> products. Having common compatible can be useful, although it depends
> what's in the common part. For example for IMX8 it was quite a lot, thus
> it made sense.
>
> >
> > So the existing DART-MX6 I think uses the same SoC but is in a different
> > family and as such has a different carrier board. However as the relation
> > between the SoM and the carrier board is effectively the same, I just copied
> > the way compatibile is being set there for the VAR-SOM-MX6 from the
> > existing DART-MX6 custom board device tree.
> >
> > I think this roughly represents the SoM board device tree associations as I'm
> > understanding them:
> >
> > pin2pin Family: DART
> > SoM: https://www.variscite.com/product/system-on-module-som/cortex-a9/dart-mx6-cpu-freescale-imx6/
> > SoM part: DART-MX6
> > SoM device tree: imx6qdl-var-dart.dtsi
> > SoM SoC: imx6q
> > Board: https://www.variscite.com/product/single-board-computers/dt6customboard/
> > Board device tree: imx6q-var-dt6customboard.dts
> > Board compatible: compatible = "variscite,dt6customboard", "fsl,imx6q";
> >
> > pin2pin Family: VAR-SOM
> > SoM: https://www.variscite.com/product/system-on-module-som/cortex-a9/var-som-mx6-cpu-freescale-imx6/
> > SoM part: VAR-SOM-MX6
> > SoM device tree: imx6qdl-var-som.dtsi
> > SoM SoC: imx6q
> > Board: mx6customboard
> > https://www.variscite.com/product/single-board-computers/var-mx6customboard/
> > Board device tree: imx6q-var-mx6customboard.dts
> > Board compatible: compatible = "variscite,mx6customboard", "fsl,imx6q";
> >
> > What's confusing here is that the DART-MX6 is also described as a SoM:
> > "DART-MX6 from Variscite is the smallest System on Module (SoM) / Computer
> > on Module (CoM) supporting NXP/Freescale’s i.MX6 Quad and Dual-core
> > Cortex-A9™ processor"
>
> It is not confusing. It is a SoM.
>
> >
> > So we have a "DART-MX6" SoM part which corresponds to the "VAR-SOM-MX6"
> > SoM part, with both being SoM's but only one("VAR-SOM-MX6") having SoM in
> > the actual part name.
>
> Vendor naming is one thing, but true meaning is second. These are
> System-on-Modules.
>
> >
> > Does the compatible section for imx6qdl-var-dart.dtsi look correct?
> >
> > I'm not sure what exactly a "SoM compatible" should look like here as SoM is
> > both a generic term(used to describe by both the "DART-MX6" and
> > "VAR-SOM-MX6" parts) as well as term used within a part(used in the
> > part for "VAR-SOM-MX6" as well as other SoM's in the "VAR-SOM" family
> > but not the "DART-MX6" part or other SoM's in the "DART" family).
>
> Take a look at IMX8 Variscite SoMs.

Oh, I see what you mean now, so it looks like this is missing for the dart-mx6
device tree.

imx8mm-var-som.dtsi:    compatible = "variscite,var-som-mx8mm", "fsl,imx8mm";
imx8mm-var-som-symphony.dts:    compatible =
"variscite,var-som-mx8mm-symphony", "variscite,var-som-mx8mm",
"fsl,imx8mm";

imx6q-var-dt6customboard.dts:    compatible =
"variscite,dt6customboard", "fsl,imx6q";

So the DART-MX6 is missing a compatible along the lines of
"variscite,dart-imx6q"
for the dart SoM I guess?

And for VAR-SOM-MX6 I guess I should use something like
"variscite,var-som-imx6q"
for the SoM right?

>
> Best regards,
> Krzysztof
>
Krzysztof Kozlowski July 20, 2023, 12:36 p.m. UTC | #5
On 20/07/2023 14:22, James Hilliard wrote:
>> Take a look at IMX8 Variscite SoMs.
> 
> Oh, I see what you mean now, so it looks like this is missing for the dart-mx6
> device tree.
> 
> imx8mm-var-som.dtsi:    compatible = "variscite,var-som-mx8mm", "fsl,imx8mm";
> imx8mm-var-som-symphony.dts:    compatible =
> "variscite,var-som-mx8mm-symphony", "variscite,var-som-mx8mm",
> "fsl,imx8mm";
> 
> imx6q-var-dt6customboard.dts:    compatible =
> "variscite,dt6customboard", "fsl,imx6q";
> 
> So the DART-MX6 is missing a compatible along the lines of
> "variscite,dart-imx6q"
> for the dart SoM I guess?

It's different topic whether it is worth to fix DART-MX6. In general it
misses its compatible, but it might be not worth to fix.

> 
> And for VAR-SOM-MX6 I guess I should use something like
> "variscite,var-som-imx6q"
> for the SoM right?

Yes.

Best regards,
Krzysztof
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml
index 15d411084065..0f583852de8a 100644
--- a/Documentation/devicetree/bindings/arm/fsl.yaml
+++ b/Documentation/devicetree/bindings/arm/fsl.yaml
@@ -298,6 +298,7 @@  properties:
               - udoo,imx6q-udoo           # Udoo i.MX6 Quad Board
               - uniwest,imx6q-evi         # Uniwest Evi
               - variscite,dt6customboard
+              - variscite,mx6customboard
               - wand,imx6q-wandboard      # Wandboard i.MX6 Quad Board
               - ysoft,imx6q-yapp4-crux    # i.MX6 Quad Y Soft IOTA Crux board
               - ysoft,imx6q-yapp4-pegasus # i.MX6 Quad Y Soft IOTA Pegasus board
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 59829fc90315..9cfc3d3e91ea 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -665,6 +665,7 @@  dtb-$(CONFIG_SOC_IMX6Q) += \
 	imx6q-udoo.dtb \
 	imx6q-utilite-pro.dtb \
 	imx6q-var-dt6customboard.dtb \
+	imx6q-var-mx6customboard.dtb \
 	imx6q-vicut1.dtb \
 	imx6q-wandboard.dtb \
 	imx6q-wandboard-revb1.dtb \
diff --git a/arch/arm/boot/dts/imx6q-var-mx6customboard.dts b/arch/arm/boot/dts/imx6q-var-mx6customboard.dts
new file mode 100644
index 000000000000..66047dff11ec
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-var-mx6customboard.dts
@@ -0,0 +1,279 @@ 
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Support for Variscite MX6 Carrier-board
+ *
+ * Copyright 2016 Variscite, Ltd. All Rights Reserved
+ * Copyright 2022 Bootlin
+ */
+
+/dts-v1/;
+
+#include "imx6qdl-var-som.dtsi"
+#include <dt-bindings/pwm/pwm.h>
+
+/ {
+	model = "Variscite i.MX6 QUAD/DUAL VAR-SOM-MX6 Custom Board";
+	compatible = "variscite,mx6customboard", "fsl,imx6q";
+
+	reg_usb_otg_vbus: regulator-usb-otg-vbus {
+		compatible = "regulator-fixed";
+		regulator-name = "usb_otg_vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+	};
+
+	reg_usb_h1_vbus: regulator-usb-h1-vbud {
+		compatible = "regulator-fixed";
+		regulator-name = "usb_h1_vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+	};
+
+	reg_audio: regulator-audio {
+		compatible = "regulator-fixed";
+		regulator-name = "tlv320aic3x-supply";
+		enable-active-high;
+	};
+
+	panel0: lvds-panel0 {
+		compatible =  "panel-lvds";
+		backlight = <&backlight_lvds>;
+		width-mm = <152>;
+		height-mm = <91>;
+		label = "etm070001adh6";
+		data-mapping = "jeida-18";
+
+		panel-timing {
+			clock-frequency = <32000000>;
+			hactive = <800>;
+			vactive = <480>;
+			hback-porch = <39>;
+			hfront-porch = <39>;
+			vback-porch = <29>;
+			vfront-porch = <13>;
+			hsync-len = <47>;
+			vsync-len = <2>;
+		};
+
+		port {
+			panel_in_lvds0: endpoint {
+				remote-endpoint = <&lvds0_out>;
+			};
+		};
+	};
+
+	panel1: lvds-panel1 {
+		compatible =  "panel-lvds";
+		width-mm = <152>;
+		height-mm = <91>;
+		data-mapping = "jeida-18";
+
+		panel-timing {
+			clock-frequency = <38251000>;
+			hactive = <800>;
+			vactive = <600>;
+			hback-porch = <112>;
+			hfront-porch = <32>;
+			vback-porch = <3>;
+			vfront-porch = <17>;
+			hsync-len = <80>;
+			vsync-len = <4>;
+		};
+
+		port {
+			panel_in_lvds1: endpoint {
+				remote-endpoint = <&lvds1_out>;
+			};
+		};
+	};
+
+	backlight_lvds: backlight-lvds {
+		compatible = "pwm-backlight";
+		pwms = <&pwm2 0 50000 0>;
+		brightness-levels = <0 4 8 16 32 64 128 248>;
+		default-brightness-level = <7>;
+		power-supply = <&reg_pu>;
+	};
+};
+
+&i2c3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c3>;
+	status = "okay";
+
+	touchscreen@24 {
+		compatible = "cypress,tt21000";
+		reg = <0x24>;
+		interrupt-parent = <&gpio3>;
+		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
+		reset-gpios = <&gpio5 13 GPIO_ACTIVE_LOW>;
+		vdd-supply = <&touch_3v3_regulator>;
+		touchscreen-size-x = <880>;
+		touchscreen-size-y = <1280>;
+	};
+
+	touchscreen@38 {
+		compatible = "edt,edt-ft5306";
+		reg = <0x38>;
+		interrupt-parent = <&gpio3>;
+		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
+		touchscreen-size-x = <1800>;
+		touchscreen-size-y = <1000>;
+	};
+};
+
+&iomuxc {
+	pinctrl_ipu1: ipu1grp {
+		fsl,pins = <
+			MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK	0x10
+			MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15		0x10
+			MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02		0x10
+			MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03		0x10
+			MX6QDL_PAD_DI0_PIN4__IPU1_DI0_PIN04		0x80000000
+			MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00	0x10
+			MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01	0x10
+			MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02	0x10
+			MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03	0x10
+			MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04	0x10
+			MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05	0x10
+			MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06	0x10
+			MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07	0x10
+			MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08	0x10
+			MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09	0x10
+			MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10	0x10
+			MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11	0x10
+			MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12	0x10
+			MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13	0x10
+			MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14	0x10
+			MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15	0x10
+			MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16	0x10
+			MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17	0x10
+			MX6QDL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18	0x10
+			MX6QDL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19	0x10
+			MX6QDL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20	0x10
+			MX6QDL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21	0x10
+			MX6QDL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22	0x10
+			MX6QDL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23	0x10
+		>;
+	};
+
+	pinctrl_ipu1: ipu1grp {
+		fsl,pins = <
+			MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12		0x80000000
+			MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13		0x80000000
+			MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14		0x80000000
+			MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15		0x80000000
+			MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16		0x80000000
+			MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17		0x80000000
+			MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18		0x80000000
+			MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19		0x80000000
+			MX6QDL_PAD_CSI0_DATA_EN__IPU1_CSI0_DATA_EN	0x80000000
+			MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK	0x80000000
+			MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC		0x80000000
+			MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC		0x80000000
+		>;
+	};
+
+	pinctrl_usbotg_var: usbotggrp {
+		fsl,pins = <
+			MX6QDL_PAD_GPIO_4__GPIO1_IO04		0x17059
+		>;
+	};
+
+	pinctrl_usdhc1: usdhc1grp {
+		fsl,pins = <
+			MX6QDL_PAD_SD1_CMD__SD1_CMD		0x17071
+			MX6QDL_PAD_SD1_CLK__SD1_CLK		0x10071
+			MX6QDL_PAD_SD1_DAT0__SD1_DATA0		0x17071
+			MX6QDL_PAD_SD1_DAT1__SD1_DATA1		0x17071
+			MX6QDL_PAD_SD1_DAT2__SD1_DATA2		0x17071
+			MX6QDL_PAD_SD1_DAT3__SD1_DATA3		0x17071
+		>;
+	};
+
+	pinctrl_usdhc2: usdhc2grp {
+		fsl,pins = <
+			MX6QDL_PAD_SD2_CMD__SD2_CMD		0x17059
+			MX6QDL_PAD_SD2_CLK__SD2_CLK		0x10059
+			MX6QDL_PAD_SD2_DAT0__SD2_DATA0		0x17059
+			MX6QDL_PAD_SD2_DAT1__SD2_DATA1		0x17059
+			MX6QDL_PAD_SD2_DAT2__SD2_DATA2		0x17059
+			MX6QDL_PAD_SD2_DAT3__SD2_DATA3		0x17059
+		>;
+	};
+
+	pinctrl_flexcan1: flexcan1grp {
+		fsl,pins = <
+			MX6QDL_PAD_GPIO_7__FLEXCAN1_TX		0x80000000
+			MX6QDL_PAD_GPIO_8__FLEXCAN1_RX		0x80000000
+		>;
+	};
+};
+
+&usbh1 {
+	vbus-supply = <&reg_usb_h1_vbus>;
+	status = "okay";
+};
+
+&ldb {
+	status = "okay";
+
+	lvds-channel@0 {
+		fsl,data-mapping = "spwg";
+		fsl,data-width = <24>;
+		status = "okay";
+		port@4 {
+			reg = <4>;
+
+			lvds0_out: endpoint {
+				remote-endpoint = <&panel_in_lvds0>;
+			};
+		};
+	};
+
+	lvds-channel@1 {
+		fsl,data-mapping = "spwg";
+		fsl,data-width = <24>;
+		status = "okay";
+		port@4 {
+			reg = <4>;
+
+			lvds1_out: endpoint {
+				remote-endpoint = <&panel_in_lvds1>;
+			};
+		};
+	};
+};
+
+&usbotg {
+	vbus-supply = <&reg_usb_otg_vbus>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usbotg_var>;
+	disable-over-current;
+	dr_mode = "host";
+	status = "okay";
+};
+
+&usbphy1 {
+	fsl,tx-d-cal = <0x5>;
+};
+
+&usbphy2 {
+	fsl,tx-d-cal = <0x5>;
+};
+
+&usdhc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc1>;
+	non-removable;
+	keep-power-in-suspend;
+	status = "okay";
+};
+
+&usdhc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc2>;
+	cd-gpios = <&gpio4 14 GPIO_ACTIVE_LOW>;
+	wp-gpios = <&gpio4 15 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+};