Skip to content

ARM: dts: imx7-colibri: device tree improvements

Marcel Ziswiler linux-arm-kernel linux-devicetree lkml soc 2 versions – Applied

Status from this message: Applied all, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest24 patches 4 repliesApplied
  2. v124 patches 3 repliesSuperseded

Changes in v2 from the cover letter

- Add Krzysztof's acked-by. Thanks!
- Revert change on arch/arm/boot/dts/imx6dl-colibri-iris.dts which slipped into this patch set by error.
- Re-based on top of Shawn's for-next.

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/24ARM: dts: imx7-colibri: overhaul display/touch functionalityarch/arm/boot/dts/imx7-colibri-aster.dtsi arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi arch/arm/boot/dts/imx7-colibri.dtsi +4 more+197 -1210 replies
2/24ARM: dts: imx7-colibri: add mdio phy nodearch/arm/boot/dts/imx7-colibri.dtsi+24 -110 replies
3/24ARM: dts: imx7-colibri: set lcdif clock source to video pllarch/arm/boot/dts/imx7-colibri.dtsi+2 -00 replies
4/24ARM: dts: imx7-colibri: add usb dual-role switching using extconarch/arm/boot/dts/imx7-colibri-eval-v3.dtsi arch/arm/boot/dts/imx7-colibri.dtsi+10 -30 replies
5/24ARM: dts: imx7-colibri: improve licensing and compatible stringsarch/arm/boot/dts/imx7-colibri-aster.dtsi arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi arch/arm/boot/dts/imx7-colibri.dtsi +9 more+38 -310 replies
6/24ARM: dts: imx7-colibri: improve wake-up with gpio keyarch/arm/boot/dts/imx7-colibri-aster.dtsi arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi+2 -20 replies
7/24ARM: dts: imx7-colibri: move aliases, chosen, extcon and gpio-keysarch/arm/boot/dts/imx7-colibri-aster.dtsi arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi arch/arm/boot/dts/imx7-colibri.dtsi+32 -490 replies
8/24ARM: dts: imx7-colibri: add ethernet aliasesarch/arm/boot/dts/imx7d-colibri-emmc.dtsi arch/arm/boot/dts/imx7d-colibri.dtsi+12 -00 replies
9/24ARM: dts: imx7-colibri: move regulatorsarch/arm/boot/dts/imx7-colibri-aster.dtsi arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi arch/arm/boot/dts/imx7-colibri.dtsi +6 more+35 -620 replies
10/24ARM: dts: imx7-colibri: add delay for on-module phy supplyarch/arm/boot/dts/imx7-colibri.dtsi+13 -20 replies
11/24ARM: dts: imx7-colibri: clean-up usdhc1 and add sleep configarch/arm/boot/dts/imx7-colibri-aster.dtsi arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi arch/arm/boot/dts/imx7-colibri.dtsi+51 -320 replies
12/24ARM: dts: imx7-colibri: move rtc nodearch/arm/boot/dts/imx7-colibri-aster.dtsi arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi arch/arm/boot/dts/imx7-colibri.dtsi+17 -120 replies
13/24ARM: dts: imx7d-colibri-emmc: add cpu1 supplyarch/arm/boot/dts/imx7d-colibri-emmc.dtsi+4 -00 replies
14/24ARM: dts: imx7-colibri-eval-v3: correct can controller commentarch/arm/boot/dts/imx7-colibri-eval-v3.dtsi+1 -10 replies
15/24ARM: dts: imx7-colibri: disable adc2arch/arm/boot/dts/imx7-colibri-aster.dtsi arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi arch/arm/boot/dts/imx7-colibri.dtsi+2 -130 replies
16/24ARM: dts: imx7-colibri-aster: add ssp aka spi cs aka ss pinsarch/arm/boot/dts/imx7-colibri-aster.dtsi+10 -00 replies
17/24ARM: dts: imx7-colibri: add clarifying commentsarch/arm/boot/dts/imx7-colibri-aster.dtsi arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi arch/arm/boot/dts/imx7-colibri.dtsi +8 more+121 -630 replies
18/24ARM: dts: imx7-colibri: alphabetical re-orderarch/arm/boot/dts/imx7-colibri-eval-v3.dtsi arch/arm/boot/dts/imx7-colibri.dtsi+186 -1880 replies
19/24ARM: dts: imx7-colibri: clean-up device enabling/disablingarch/arm/boot/dts/imx7-colibri-eval-v3.dtsi arch/arm/boot/dts/imx7-colibri.dtsi+0 -60 replies
20/24ARM: dts: imx7-colibri: remove leading zero from reg addressarch/arm/boot/dts/imx7-colibri.dtsi+1 -10 replies
21/24ARM: dts: imx7-colibri: set regulator-name propertiesarch/arm/boot/dts/imx7-colibri.dtsi+18 -90 replies
22/24ARM: dts: imx7-colibri: clean-up iomuxc pinctrl group namingarch/arm/boot/dts/imx7-colibri.dtsi+35 -350 replies
23/24dt-bindings: arm: fsl: add toradex,colibri-imx7s/d/d-emmc-iris/-v2Documentation/devicetree/bindings/arm/fsl.yaml+6 -00 replies
24/24ARM: dts: imx7-colibri: add support for Toradex Iris carrier boardsarch/arm/boot/dts/Makefile arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi arch/arm/boot/dts/imx7-colibri-iris.dtsi +6 more+536 -00 replies

Reviews trailers per patch

1 of 24 patches has a Reviewed-by or Acked-by.

PatchKrzysztof Kozlowski
1/24
2/24
3/24
4/24
5/24
6/24
7/24
8/24
9/24
10/24
11/24
12/24
13/24
14/24
15/24
16/24
17/24
18/24
19/24
20/24
21/24
22/24
23/24A-b
24/24

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/24] ARM: dts: imx7-colibri: device tree improvements

From: Marcel Ziswiler <[email protected]>

This is a general update of the Colibri iMX7 device tree files.

The Toradex Colibri family is composed of a SoM that can be plugged on various carrier boards, with carrier boards allowing multiple optional accessories (e.g. display, camera, ...).

The device tree sources are structured into a SoM dtsi and a carrier dts which then includes the SoM dtsi. The SoM dtsi defines and enables the functionality self-contained on the SoM and prepares for the functionality provided by the carrier HW or accessories so that the carrier dts then can enable or amend nodes provided. Accessories are enabled in overlays depending on HW configuration.

Please find the following colibri-imx7 device trees improvements:

- Display/Touch Functionality Overhaul
Rename display interface to match other modules to make it easier to use device tree overlays.
The parallel RGB interface (lcdif) and all related stuff turn on in a device tree overlay. Keep them disabled in the main devicetree. As these subsystems are provided by module and not a part of boards, move their definitions into the module-level devicetree. Disable ad7879 touchscreen which turns on in a devic tree overlay. Remains it disabled in the main devicetree.
The Toradex 7" Capacitive and 10" LVDS touch screens are Atmel MXT peripherals available on the I2C bus for touchscreen events. Add atmel_mxt_ts node to the module-level device tree. Also, provide pinmux configuration for the INT/RST inputs from SODIMM pins 106/107 for most carrier boards or an external touchscreen adapter inputs configured to SODIMM pins 28/30.

- Ethernet Improvements
Add the MDIO bus with the respective PHY.
Add Ethernet aliases which is required to properly pass MAC address from bootloader.
Add delay for on-module phy supply.

- USB Device/Host Switching
Add usb dual-role switching using extcon.

- MMC/SD
The original Colibri specification only defined 3.3 volt TTL signaling and relied on external on-carrier pull-ups for the SD_DATA[0..3] lines. The latest carrier boards like Iris V2 on the other hand are now UHS-I compliant by leaving such external on-carrier pull-ups away relying on module- or even SoC-level ones which pull up to resp. signaling voltage. In such cases, the carrier board-level device tree may explicitly delete the no-1-8-v property to enable full UHS-I support.
Also, fix SD/MMC regulator for the carrier boards using UHS-I modes.

- Add Iris and Iris V2 Carrier Board Device Trees
Add support for Toradex Iris carrier boards.

Changes in v2:
- Add Krzysztof's acked-by. Thanks!
- Revert change on arch/arm/boot/dts/imx6dl-colibri-iris.dts which slipped into this patch set by error.
- Re-based on top of Shawn's for-next.

Marcel Ziswiler (18):
ARM: dts: imx7-colibri: overhaul display/touch functionality
ARM: dts: imx7-colibri: add mdio phy node
ARM: dts: imx7-colibri: move aliases, chosen, extcon and gpio-keys
ARM: dts: imx7-colibri: move regulators
ARM: dts: imx7-colibri: clean-up usdhc1 and add sleep config
ARM: dts: imx7-colibri: move rtc node
ARM: dts: imx7d-colibri-emmc: add cpu1 supply
ARM: dts: imx7-colibri-eval-v3: correct can controller comment
ARM: dts: imx7-colibri: disable adc2
ARM: dts: imx7-colibri-aster: add ssp aka spi cs aka ss pins
ARM: dts: imx7-colibri: add clarifying comments
ARM: dts: imx7-colibri: alphabetical re-order
ARM: dts: imx7-colibri: clean-up device enabling/disabling
ARM: dts: imx7-colibri: remove leading zero from reg address
ARM: dts: imx7-colibri: set regulator-name properties
ARM: dts: imx7-colibri: clean-up iomuxc pinctrl group naming
dt-bindings: arm: fsl: add toradex,colibri-imx7s/d/d-emmc-iris/-v2
ARM: dts: imx7-colibri: add support for Toradex Iris carrier boards

Max Krummenacher (1):
ARM: dts: imx7-colibri: add ethernet aliases

Oleksandr Suvorov (3):
ARM: dts: imx7-colibri: improve licensing and compatible strings
ARM: dts: imx7-colibri: improve wake-up with gpio key
ARM: dts: imx7-colibri: add delay for on-module phy supply

Philippe Schenker (1):
ARM: dts: imx7-colibri: add usb dual-role switching using extcon

Stefan Agner (1):
ARM: dts: imx7-colibri: set lcdif clock source to video pll

 .../devicetree/bindings/arm/fsl.yaml          |   6 +
 arch/arm/boot/dts/Makefile                    |   6 +
 arch/arm/boot/dts/imx7-colibri-aster.dtsi     | 142 +--
 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi   | 156 +---
 arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi   | 112 +++
 arch/arm/boot/dts/imx7-colibri-iris.dtsi      | 108 +++
 arch/arm/boot/dts/imx7-colibri.dtsi           | 830 +++++++++++-------
 arch/arm/boot/dts/imx7d-colibri-aster.dts     |  30 +-
 .../arm/boot/dts/imx7d-colibri-emmc-aster.dts |  10 +-
 .../boot/dts/imx7d-colibri-emmc-eval-v3.dts   |  10 +-
 .../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-emmc.dtsi     |  17 +-
 arch/arm/boot/dts/imx7d-colibri-eval-v3.dts   |  45 +-
 arch/arm/boot/dts/imx7d-colibri-iris-v2.dts   |  83 ++
 arch/arm/boot/dts/imx7d-colibri-iris.dts      |  56 ++
 arch/arm/boot/dts/imx7d-colibri.dtsi          |  13 +-
 arch/arm/boot/dts/imx7s-colibri-aster.dts     |  27 +-
 arch/arm/boot/dts/imx7s-colibri-eval-v3.dts   |  43 +-
 arch/arm/boot/dts/imx7s-colibri-iris-v2.dts   |  78 ++
 arch/arm/boot/dts/imx7s-colibri-iris.dts      |  51 ++
 arch/arm/boot/dts/imx7s-colibri.dtsi          |   5 +-
 22 files changed, 1291 insertions(+), 579 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
Signature · 1 line
2.35.1