[PATCH v1 24/24] ARM: dts: imx7-colibri: add support for Toradex Iris carrier boards

[Marcel Ziswiler]

On Fri, 2022-05-06 at 17:58 +0200, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler at toradex.com>
> 
> Add support for Toradex Iris, small form-factor Pico-ITX Colibri Arm
> Computer Module family Carrier Board.
> 
> Additional details available at
> https://www.toradex.com/products/carrier-board/iris-carrier-board
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler at toradex.com>
> 
> ---
> 
>  arch/arm/boot/dts/Makefile                    |   6 +
>  arch/arm/boot/dts/imx6dl-colibri-iris.dts     |   9 +-
>  arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi   | 112 ++++++++++++++++++
>  arch/arm/boot/dts/imx7-colibri-iris.dtsi      | 108 +++++++++++++++++
>  .../boot/dts/imx7d-colibri-emmc-iris-v2.dts   |  21 ++++
>  arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts |  21 ++++
>  arch/arm/boot/dts/imx7d-colibri-iris-v2.dts   |  83 +++++++++++++
>  arch/arm/boot/dts/imx7d-colibri-iris.dts      |  56 +++++++++
>  arch/arm/boot/dts/imx7s-colibri-iris-v2.dts   |  78 ++++++++++++
>  arch/arm/boot/dts/imx7s-colibri-iris.dts      |  51 ++++++++
>  10 files changed, 540 insertions(+), 5 deletions(-)
>  create mode 100644 arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi
>  create mode 100644 arch/arm/boot/dts/imx7-colibri-iris.dtsi
>  create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts
>  create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts
>  create mode 100644 arch/arm/boot/dts/imx7d-colibri-iris-v2.dts
>  create mode 100644 arch/arm/boot/dts/imx7d-colibri-iris.dts
>  create mode 100644 arch/arm/boot/dts/imx7s-colibri-iris-v2.dts
>  create mode 100644 arch/arm/boot/dts/imx7s-colibri-iris.dts
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index b711d4423b42..5a9c805dbc84 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -726,8 +726,12 @@ dtb-$(CONFIG_SOC_IMX7D) += \
>         imx7d-cl-som-imx7.dtb \
>         imx7d-colibri-aster.dtb \
>         imx7d-colibri-emmc-aster.dtb \
> +       imx7d-colibri-emmc-iris.dtb \
> +       imx7d-colibri-emmc-iris-v2.dtb \
>         imx7d-colibri-emmc-eval-v3.dtb \
>         imx7d-colibri-eval-v3.dtb \
> +       imx7d-colibri-iris.dtb \
> +       imx7d-colibri-iris-v2.dtb \
>         imx7d-flex-concentrator.dtb \
>         imx7d-flex-concentrator-mfg.dtb \
>         imx7d-mba7.dtb \
> @@ -747,6 +751,8 @@ dtb-$(CONFIG_SOC_IMX7D) += \
>         imx7d-zii-rpu2.dtb \
>         imx7s-colibri-aster.dtb \
>         imx7s-colibri-eval-v3.dtb \
> +       imx7s-colibri-iris.dtb \
> +       imx7s-colibri-iris-v2.dtb \
>         imx7s-mba7.dtb \
>         imx7s-warp.dtb
>  dtb-$(CONFIG_SOC_IMX7ULP) += \
> diff --git a/arch/arm/boot/dts/imx6dl-colibri-iris.dts b/arch/arm/boot/dts/imx6dl-colibri-iris.dts
> index cf77d894f6d7..6e048d696c77 100644
> --- a/arch/arm/boot/dts/imx6dl-colibri-iris.dts
> +++ b/arch/arm/boot/dts/imx6dl-colibri-iris.dts
> @@ -40,11 +40,10 @@ &gpio2 {
>         pinctrl-0 = <&pinctrl_uart1_forceoff &pinctrl_uart23_forceoff>;
>  
>         /*
> -        * uart-a-on-x13-enable turns the UART transceiver for UART_A on. If one
> -        * wants to turn the transceiver off, that property has to be deleted
> -        * and the gpio handled in userspace.
> -        * The same applies to uart-b-c-on-x14-enable where the UART_B and
> -        * UART_C transceiver is turned on.
> +        * uart-a-on-x13-enable-hog turns the UART transceiver for UART_A on. If one wants to turn
> +        * the transceiver off, that property has to be deleted and the gpio handled in userspace.
> +        * The same applies to uart-b-c-on-x14-enable-hog where the UART_B and UART_C transceiver is
> +        * turned on.
>          */
>         uart-a-on-x13-enable-hog {
>                 gpio-hog;

Yes, that change to arch/arm/boot/dts/imx6dl-colibri-iris.dts slipped into this Colibri iMX7 specific patch set
by error and will be removed in an upcoming V2. Sorry about that.

[snip]