Skip to contentSkip to conversation

arm: dts: imx: sync device trees with upstream linux kernel ones

PATCH In review Marcel Ziswiler 10 participants 72 messages Jul 21, 2022 – Sep 6, 2022

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

cover arm: dts: imx: sync device trees with upstream linux kernel ones

From: Marcel Ziswiler <[email protected]>

This series synchronises them imx device trees with the upstream Linux kernel (v5.19-rc5 resp. linux-next 20220706 where we have further pending patches being Apalis/Colibri iMX6 and Colibri iMX7).

Please note that for the Toradex targets this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device trees we are now using regular eval resp. dev(board) ones (e.g. imx6q-apalis-eval.dtb rather than previous imx6-apalis.dtb).

I concentrated on SoC families where I had hardware available for testing which is mainly i.MX 6, i.MX 6ULL, i.MX 7, i.MX 8M Mini, i.MX 8M Plus and vf500/vf610 aka Vybrid. I also did i.MX 8M Nano and the regular i.MX 8M aka imx8mq just because they seemed very similar. However, I left away imx23, imx28, imx53, i.MX 6QP, i.MX 6SL(L), i.MX 6SX, i.MX 6ULZ, i.MX 7ULP and i.MX 8/8X aka them SCFW-based ones. The former two because we do not have any such hardware available and the latter just because we at Toradex do currently not really have much updated upstream Linux kernel device tree support available for those.

One thing I noticed is that the upstream Linux kernel device tree for the imx8mm-evk seems outdated and still uses the Rohm BD71847 PMIC. Likely therefore this sync might not make much sense there resp. might even break it. Should I just not sync that or how should I proceed?

Due to the u-boot-imx custodian/maintainer tree not having been re-based recently I based this series on the latest regular master. Once it might get re-based I might also re-base this series to ultimately be applied there.

Feedback welcome. Thanks!

Marcel Ziswiler (26):
board/BuR/brppt2: fix pwms property warning
imx6: aristainetos: fix pwms property warnings
tbs2910: prepare to synchronise device trees with linux imx6dl/imx6qdl: synchronise device trees with linux
apalis_imx6: synchronise device tree with linux
colibri_imx6: synchronise device tree with linux
imx: mx6ul_14x14_evk: prepare to synchronise device trees with linux imx6ul/imx6ull: synchronise device trees with linux colibri-imx6ull/-emmc: synchronise device tree with linux
imx: imx7-cm: prepare to synchronise device trees with linux
imx: imx7d-sdb: prepare to synchronise device trees with linux imx7s/d: synchronise device trees with linux colibri-imx7d/-emmc: synchronise device tree with linux
ARM: DTS: bk4r1/pcm052: prepare to synchronise device trees with linux vf500/vf610: synchronise device trees with linux
colibri_vf: synchronise device tree with linux
imx8mm-venice-gw700x: prepare to synchronise device trees with linux
imx8mm: synchronise device tree with linux imx8mm-kontron-n801x-s-lvds: fix pwms property warnings imx8mm-mx8menlo/verdin-imx8mm: synchronise device tree with linux
imx8mn: synchronise device tree with linux
imx8mp: synchronise device tree with linux
imx8mp-rsb3720-a1: fix pwms property warnings
verdin-imx8mp: synchronise device tree with linux
imx8mq: synchronise device tree with linux
board: toradex: apalis-imx8: fix file names in maintainers

 arch/arm/dts/Makefile                         |   21 +-
 arch/arm/dts/imx6-apalis-u-boot.dtsi          |   11 -
 arch/arm/dts/imx6-apalis.dts                  |  752 ---------
 arch/arm/dts/imx6-colibri.dts                 |  431 ------
 arch/arm/dts/imx6-logicpd-baseboard.dtsi      |   12 +-
 arch/arm/dts/imx6-logicpd-som.dtsi            |    4 +
 arch/arm/dts/imx6dl-brppt2.dts                |    1 +
 .../dts/imx6dl-colibri-eval-v3-u-boot.dtsi    |   20 +
 arch/arm/dts/imx6dl-colibri-eval-v3.dts       |  157 ++
 arch/arm/dts/imx6dl-mamoj.dts                 |  273 +++-
 arch/arm/dts/imx6dl-mba6.dtsi                 |   10 +-
 arch/arm/dts/imx6dl-mba6a.dts                 |   15 +-
 arch/arm/dts/imx6dl-mba6b.dts                 |   15 +-
 arch/arm/dts/imx6dl-nitrogen6x.dts            |   12 +-
 arch/arm/dts/imx6dl-pinfunc.h                 |    7 +-
 arch/arm/dts/imx6dl-riotboard.dts             |    2 +
 arch/arm/dts/imx6dl-sabreauto.dts             |   15 +
 arch/arm/dts/imx6dl-tqma6a.dtsi               |   12 +-
 arch/arm/dts/imx6dl-tqma6b.dtsi               |   12 +-
 arch/arm/dts/imx6dl.dtsi                      |   15 +-
 arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi    |   25 +
 arch/arm/dts/imx6q-apalis-eval.dts            |  170 ++
 arch/arm/dts/imx6q-b450v3.dts                 |   19 +-
 arch/arm/dts/imx6q-b650v3.dts                 |   17 +-
 arch/arm/dts/imx6q-b850v3.dts                 |   23 +-
 arch/arm/dts/imx6q-ba16.dtsi                  |   18 +-
 arch/arm/dts/imx6q-bosch-acc.dts              |   14 +-
 arch/arm/dts/imx6q-bx50v3.dtsi                |   61 +-
 arch/arm/dts/imx6q-cm-fx6.dts                 |  112 +-
 arch/arm/dts/imx6q-icore-ofcap10.dts          |   28 +-
 arch/arm/dts/imx6q-logicpd.dts                |   18 +-
 arch/arm/dts/imx6q-marsboard.dts              |    2 +-
 arch/arm/dts/imx6q-mba6.dtsi                  |   32 +-
 arch/arm/dts/imx6q-mba6a.dts                  |   14 +-
 arch/arm/dts/imx6q-mba6b.dts                  |   14 +-
 arch/arm/dts/imx6q-mccmon6.dts                |  213 ++-
 arch/arm/dts/imx6q-nitrogen6x.dts             |   12 +-
 arch/arm/dts/imx6q-novena.dts                 |   42 +-
 arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts   |    3 +
 arch/arm/dts/imx6q-pinfunc.h                  |    7 +-
 arch/arm/dts/imx6q-sabrelite.dts              |    6 +-
 arch/arm/dts/imx6q-tbs2910-u-boot.dtsi        |    4 +-
 arch/arm/dts/imx6q-tbs2910.dts                |    9 +-
 arch/arm/dts/imx6q-tqma6a.dtsi                |   12 +-
 arch/arm/dts/imx6q-tqma6b.dtsi                |   11 +-
 arch/arm/dts/imx6q.dtsi                       |   40 +-
 arch/arm/dts/imx6qdl-apalis.dtsi              | 1372 ++++++++++++++++
 .../arm/dts/imx6qdl-aristainetos2-common.dtsi |    1 +
 arch/arm/dts/imx6qdl-colibri.dtsi             | 1296 ++++++++++++++++
 arch/arm/dts/imx6qdl-cubox-i.dtsi             |    5 +-
 arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi          |    6 +-
 arch/arm/dts/imx6qdl-dhcom-som.dtsi           |    8 +-
 arch/arm/dts/imx6qdl-gw51xx.dtsi              |    7 +-
 arch/arm/dts/imx6qdl-gw52xx.dtsi              |   10 +-
 arch/arm/dts/imx6qdl-gw53xx.dtsi              |   22 +-
 arch/arm/dts/imx6qdl-gw54xx.dtsi              |   22 +-
 arch/arm/dts/imx6qdl-gw551x.dtsi              |    7 +-
 arch/arm/dts/imx6qdl-gw552x.dtsi              |   29 +-
 arch/arm/dts/imx6qdl-gw553x.dtsi              |    5 +-
 arch/arm/dts/imx6qdl-gw560x.dtsi              |   14 +-
 arch/arm/dts/imx6qdl-gw5903.dtsi              |    6 -
 arch/arm/dts/imx6qdl-gw5904.dtsi              |   27 +-
 arch/arm/dts/imx6qdl-gw5907.dtsi              |    9 +-
 arch/arm/dts/imx6qdl-gw5910.dtsi              |    7 -
 arch/arm/dts/imx6qdl-gw5912.dtsi              |   22 +-
 arch/arm/dts/imx6qdl-gw5913.dtsi              |   10 +-
 arch/arm/dts/imx6qdl-hummingboard2.dtsi       |    2 +-
 arch/arm/dts/imx6qdl-icore.dtsi               |   19 +-
 arch/arm/dts/imx6qdl-mba6.dtsi                |  598 +++++--
 arch/arm/dts/imx6qdl-mba6a.dtsi               |   35 +-
 arch/arm/dts/imx6qdl-mba6b.dtsi               |   40 +-
 arch/arm/dts/imx6qdl-nitrogen6x.dtsi          |  733 ++++++++-
 .../dts/imx6qdl-phytec-mira-peb-av-02.dtsi    |  119 ++
 .../dts/imx6qdl-phytec-mira-peb-eval-01.dtsi  |   71 +
 .../dts/imx6qdl-phytec-mira-peb-wlbt-05.dtsi  |   85 +
 arch/arm/dts/imx6qdl-phytec-mira.dtsi         |   32 +-
 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi  |   30 +-
 arch/arm/dts/imx6qdl-pico.dtsi                |  226 ++-
 arch/arm/dts/imx6qdl-sabreauto.dtsi           |  119 +-
 arch/arm/dts/imx6qdl-sabrelite.dtsi           |  828 +++++++---
 arch/arm/dts/imx6qdl-sabresd.dtsi             |  214 ++-
 arch/arm/dts/imx6qdl-sr-som-ti.dtsi           |    1 +
 arch/arm/dts/imx6qdl-sr-som.dtsi              |   31 +-
 arch/arm/dts/imx6qdl-tqma6.dtsi               |  326 ++--
 arch/arm/dts/imx6qdl-tqma6a.dtsi              |   46 +-
 arch/arm/dts/imx6qdl-tqma6b.dtsi              |   28 +-
 arch/arm/dts/imx6qdl-udoo.dtsi                |    4 +-
 arch/arm/dts/imx6qdl-wandboard-revd1.dtsi     |    2 -
 arch/arm/dts/imx6qdl-wandboard.dtsi           |  102 +-
 arch/arm/dts/imx6qdl.dtsi                     |  194 ++-
 arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi     |    6 -
 arch/arm/dts/imx6ul-14x14-evk.dtsi            |  161 +-
 arch/arm/dts/imx6ul-geam.dts                  |  363 ++++-
 arch/arm/dts/imx6ul-imx6ull-opos6ul.dtsi      |  148 ++
 arch/arm/dts/imx6ul-imx6ull-opos6uldev.dtsi   |  327 ++++
 arch/arm/dts/imx6ul-isiot-emmc.dts            |   42 +-
 arch/arm/dts/imx6ul-isiot-nand.dts            |   45 +-
 arch/arm/dts/imx6ul-isiot.dtsi                |  330 +++-
 arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi      |   20 +-
 .../dts/imx6ul-kontron-n6x1x-som-common.dtsi  |   30 +-
 arch/arm/dts/imx6ul-litesom.dtsi              |    1 +
 arch/arm/dts/imx6ul-opos6ul.dtsi              |  194 +--
 arch/arm/dts/imx6ul-opos6uldev.dts            |  387 +----
 arch/arm/dts/imx6ul-phytec-phycore-som.dtsi   |   21 +-
 .../dts/imx6ul-phytec-segin-ff-rdk-nand.dts   |    2 +
 .../dts/imx6ul-phytec-segin-peb-av-02.dtsi    |  150 ++
 .../dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi  |   90 ++
 arch/arm/dts/imx6ul-phytec-segin.dtsi         |   46 +-
 arch/arm/dts/imx6ul-pico-hobbit.dts           |    2 +-
 arch/arm/dts/imx6ul-pico-pi.dts               |    4 +-
 arch/arm/dts/imx6ul-pico.dtsi                 |   40 +-
 arch/arm/dts/imx6ul.dtsi                      |  186 ++-
 .../imx6ull-colibri-emmc-eval-v3-u-boot.dtsi  |    1 +
 arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts |   17 +
 .../arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi |  187 +++
 arch/arm/dts/imx6ull-colibri-emmc.dts         |   49 -
 ...si => imx6ull-colibri-eval-v3-u-boot.dtsi} |    4 +-
 arch/arm/dts/imx6ull-colibri-eval-v3.dts      |   14 +
 arch/arm/dts/imx6ull-colibri-eval-v3.dtsi     |  121 ++
 arch/arm/dts/imx6ull-colibri-nonwifi.dtsi     |  161 ++
 arch/arm/dts/imx6ull-colibri.dts              |   45 -
 arch/arm/dts/imx6ull-colibri.dtsi             |  558 ++++---
 arch/arm/dts/imx6ull-myir-mys-6ulx-eval.dts   |    2 +-
 .../dts/imx6ull-phytec-segin-ff-rdk-emmc.dts  |    1 +
 .../dts/imx6ull-phytec-segin-peb-av-02.dtsi   |   26 +
 arch/arm/dts/imx6ull-phytec-segin.dtsi        |    7 -
 arch/arm/dts/imx6ull.dtsi                     |   14 +
 arch/arm/dts/imx7-cm.dts                      |    2 +-
 arch/arm/dts/imx7-colibri-emmc.dts            |   94 --
 arch/arm/dts/imx7-colibri-eval-v3.dtsi        |  110 ++
 arch/arm/dts/imx7-colibri-rawnand.dts         |   96 --
 arch/arm/dts/imx7-colibri.dtsi                | 1156 ++++++++++++--
 .../imx7d-colibri-emmc-eval-v3-u-boot.dtsi    |    1 +
 arch/arm/dts/imx7d-colibri-emmc-eval-v3.dts   |   21 +
 arch/arm/dts/imx7d-colibri-emmc.dtsi          |   61 +
 ...dtsi => imx7d-colibri-eval-v3-u-boot.dtsi} |   10 +-
 arch/arm/dts/imx7d-colibri-eval-v3.dts        |   56 +
 arch/arm/dts/imx7d-colibri.dtsi               |   35 +
 arch/arm/dts/imx7d-pico-hobbit.dts            |    6 +-
 arch/arm/dts/imx7d-pico-pi.dts                |    6 +-
 arch/arm/dts/imx7d-pico.dtsi                  |  103 +-
 arch/arm/dts/imx7d-pinfunc.h                  |   14 +-
 arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi       |    2 +-
 arch/arm/dts/imx7d-sdb-qspi.dts               |    7 +-
 arch/arm/dts/imx7d-sdb.dts                    |  120 +-
 arch/arm/dts/imx7d-smegw01.dts                |  297 +++-
 arch/arm/dts/imx7d.dtsi                       |  211 ++-
 arch/arm/dts/imx7s-warp.dts                   |   70 +-
 arch/arm/dts/imx7s.dtsi                       |  472 ++++--
 arch/arm/dts/imx8mm-beacon-baseboard.dtsi     |  118 ++
 arch/arm/dts/imx8mm-data-modul-edm-sbc.dts    |    3 +-
 arch/arm/dts/imx8mm-evk-u-boot.dtsi           |    4 +-
 arch/arm/dts/imx8mm-evk.dts                   |    2 +-
 arch/arm/dts/imx8mm-evk.dtsi                  |  195 ++-
 arch/arm/dts/imx8mm-icore-mx8mm-ctouch2.dts   |    1 -
 arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2.dts  |    1 -
 arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts  |    1 +
 arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi      |    2 +-
 arch/arm/dts/imx8mm-mx8menlo.dts              |   51 +-
 arch/arm/dts/imx8mm-pinfunc.h                 |    6 +-
 arch/arm/dts/imx8mm-u-boot.dtsi               |   10 +
 arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi |    4 -
 arch/arm/dts/imx8mm-venice-gw700x.dtsi        |   11 +-
 arch/arm/dts/imx8mm-venice-gw71xx.dtsi        |   56 +-
 arch/arm/dts/imx8mm-venice-gw72xx.dtsi        |   85 +-
 arch/arm/dts/imx8mm-venice-gw73xx.dtsi        |   86 +-
 arch/arm/dts/imx8mm-venice-gw7901.dts         |  126 +-
 arch/arm/dts/imx8mm-venice-gw7902.dts         |  119 +-
 arch/arm/dts/imx8mm-venice-gw7903.dts         |    5 +
 arch/arm/dts/imx8mm-verdin-dahlia.dtsi        |  150 ++
 arch/arm/dts/imx8mm-verdin-dev.dtsi           |   67 +
 ...tsi => imx8mm-verdin-wifi-dev-u-boot.dtsi} |   48 +-
 arch/arm/dts/imx8mm-verdin-wifi-dev.dts       |   18 +
 arch/arm/dts/imx8mm-verdin-wifi.dtsi          |   94 ++
 arch/arm/dts/imx8mm-verdin.dts                | 1031 ------------
 arch/arm/dts/imx8mm-verdin.dtsi               | 1295 ++++++++++++++++
 arch/arm/dts/imx8mm.dtsi                      |  637 +++++---
 arch/arm/dts/imx8mn-beacon-baseboard.dtsi     |    4 +-
 arch/arm/dts/imx8mn-beacon-som.dtsi           |   12 +-
 arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi    |  113 +-
 arch/arm/dts/imx8mn-bsh-smm-s2pro.dts         |   90 ++
 arch/arm/dts/imx8mn-ddr4-evk.dts              |    4 +
 arch/arm/dts/imx8mn-evk-u-boot.dtsi           |    4 +-
 arch/arm/dts/imx8mn-evk.dts                   |   56 +-
 arch/arm/dts/imx8mn-evk.dtsi                  |  121 ++
 arch/arm/dts/imx8mn-var-som.dtsi              |   15 +-
 arch/arm/dts/imx8mn-venice-gw7902.dts         |   80 +-
 arch/arm/dts/imx8mn.dtsi                      |  270 ++--
 arch/arm/dts/imx8mp-evk.dts                   |  283 +++-
 arch/arm/dts/imx8mp-phycore-som.dtsi          |   64 +-
 arch/arm/dts/imx8mp-rsb3720-a1.dts            |    2 +
 arch/arm/dts/imx8mp-venice-gw74xx.dts         |   59 +-
 arch/arm/dts/imx8mp-verdin-dahlia.dtsi        |  129 ++
 arch/arm/dts/imx8mp-verdin-dev.dtsi           |   46 +
 ...tsi => imx8mp-verdin-wifi-dev-u-boot.dtsi} |   53 +-
 arch/arm/dts/imx8mp-verdin-wifi-dev.dts       |   18 +
 arch/arm/dts/imx8mp-verdin-wifi.dtsi          |   82 +
 arch/arm/dts/imx8mp-verdin.dts                |  639 --------
 arch/arm/dts/imx8mp-verdin.dtsi               | 1379 +++++++++++++++++
 arch/arm/dts/imx8mp.dtsi                      |  261 +++-
 arch/arm/dts/imx8mq-evk.dts                   |   65 +-
 arch/arm/dts/imx8mq-kontron-pitx-imx8m.dts    |    3 +-
 arch/arm/dts/imx8mq-mnt-reform2.dts           |  144 +-
 arch/arm/dts/imx8mq-nitrogen-som.dtsi         |   15 +-
 arch/arm/dts/imx8mq-phanbell.dts              |   86 +-
 arch/arm/dts/imx8mq-pico-pi-u-boot.dtsi       |    2 +
 arch/arm/dts/imx8mq-pico-pi.dts               |   67 +-
 arch/arm/dts/imx8mq.dtsi                      |  204 ++-
 arch/arm/dts/vf-colibri-eval-v3.dtsi          |  152 ++
 arch/arm/dts/vf-colibri-u-boot.dtsi           |   27 -
 arch/arm/dts/vf-colibri.dtsi                  |  474 +++---
 arch/arm/dts/vf.dtsi                          |  229 ---
 arch/arm/dts/vf500-colibri.dts                |   13 -
 arch/arm/dts/vf500.dtsi                       |   64 +
 .../arm/dts/vf610-colibri-eval-v3-u-boot.dtsi |   90 ++
 arch/arm/dts/vf610-colibri-eval-v3.dts        |   13 +
 arch/arm/dts/vf610-colibri.dts                |   13 -
 arch/arm/dts/vf610-colibri.dtsi               |   22 +
 arch/arm/dts/vf610-pcm052.dtsi                |    2 +-
 arch/arm/dts/vf610-pinfunc.h                  |    6 +-
 arch/arm/dts/vf610-twr.dts                    |  364 ++++-
 arch/arm/dts/vf610.dtsi                       |   20 +
 arch/arm/dts/vfxxx.dtsi                       |  756 +++++++++
 board/freescale/imx8mn_evk/spl.c              |    2 +-
 board/toradex/apalis-imx8/MAINTAINERS         |    4 +-
 board/toradex/apalis_imx6/MAINTAINERS         |    6 +-
 board/toradex/colibri-imx6ull/MAINTAINERS     |    7 +-
 board/toradex/colibri_imx6/MAINTAINERS        |    4 +-
 board/toradex/colibri_imx7/MAINTAINERS        |   14 +-
 board/toradex/colibri_imx7/colibri_imx7.c     |    4 +-
 board/toradex/colibri_vf/MAINTAINERS          |   10 +-
 board/toradex/verdin-imx8mm/MAINTAINERS       |    8 +-
 board/toradex/verdin-imx8mm/spl.c             |    2 +-
 board/toradex/verdin-imx8mp/MAINTAINERS       |    8 +-
 configs/apalis_imx6_defconfig                 |    2 +-
 configs/colibri-imx6ull-emmc_defconfig        |    2 +-
 configs/colibri-imx6ull_defconfig             |    2 +-
 configs/colibri_imx6_defconfig                |    2 +-
 configs/colibri_imx7_defconfig                |    2 +-
 configs/colibri_imx7_emmc_defconfig           |    2 +-
 configs/colibri_vf_defconfig                  |    2 +-
 configs/verdin-imx8mm_defconfig               |    2 +-
 configs/verdin-imx8mp_defconfig               |    2 +-
 include/dt-bindings/clock/imx6qdl-clock.h     |   14 +-
 include/dt-bindings/clock/imx7d-clock.h       |   13 +-
 include/dt-bindings/clock/imx8mm-clock.h      |    9 +-
 include/dt-bindings/clock/imx8mn-clock.h      |   25 +-
 include/dt-bindings/clock/imx8mq-clock.h      |   19 -
 include/dt-bindings/clock/vf610-clock.h       |  202 +++
 include/dt-bindings/power/imx7-power.h        |    5 +-
 include/dt-bindings/power/imx8mm-power.h      |    9 +
 include/dt-bindings/power/imx8mn-power.h      |    5 +
 include/dt-bindings/power/imx8mq-power.h      |    3 +
 include/dt-bindings/sound/tlv320aic31xx.h     |   14 +
 254 files changed, 20074 insertions(+), 7417 deletions(-)
 delete mode 100644 arch/arm/dts/imx6-apalis-u-boot.dtsi
 delete mode 100644 arch/arm/dts/imx6-apalis.dts
 delete mode 100644 arch/arm/dts/imx6-colibri.dts
 create mode 100644 arch/arm/dts/imx6dl-colibri-eval-v3-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6dl-colibri-eval-v3.dts
 create mode 100644 arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6q-apalis-eval.dts
 create mode 100644 arch/arm/dts/imx6qdl-apalis.dtsi
 create mode 100644 arch/arm/dts/imx6qdl-colibri.dtsi
 create mode 100644 arch/arm/dts/imx6qdl-phytec-mira-peb-av-02.dtsi
 create mode 100644 arch/arm/dts/imx6qdl-phytec-mira-peb-eval-01.dtsi
 create mode 100644 arch/arm/dts/imx6qdl-phytec-mira-peb-wlbt-05.dtsi
 create mode 100644 arch/arm/dts/imx6ul-imx6ull-opos6ul.dtsi
 create mode 100644 arch/arm/dts/imx6ul-imx6ull-opos6uldev.dtsi
 create mode 100644 arch/arm/dts/imx6ul-phytec-segin-peb-av-02.dtsi
 create mode 100644 arch/arm/dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi
 create mode 120000 arch/arm/dts/imx6ull-colibri-emmc-eval-v3-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts
 create mode 100644 arch/arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi
 delete mode 100644 arch/arm/dts/imx6ull-colibri-emmc.dts
 rename arch/arm/dts/{imx6ull-colibri-u-boot.dtsi => imx6ull-colibri-eval-v3-u-boot.dtsi} (91%)
 create mode 100644 arch/arm/dts/imx6ull-colibri-eval-v3.dts
 create mode 100644 arch/arm/dts/imx6ull-colibri-eval-v3.dtsi
 create mode 100644 arch/arm/dts/imx6ull-colibri-nonwifi.dtsi
 delete mode 100644 arch/arm/dts/imx6ull-colibri.dts
 create mode 100644 arch/arm/dts/imx6ull-phytec-segin-peb-av-02.dtsi
 delete mode 100644 arch/arm/dts/imx7-colibri-emmc.dts
 create mode 100644 arch/arm/dts/imx7-colibri-eval-v3.dtsi
 delete mode 100644 arch/arm/dts/imx7-colibri-rawnand.dts
 create mode 120000 arch/arm/dts/imx7d-colibri-emmc-eval-v3-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx7d-colibri-emmc-eval-v3.dts
 create mode 100644 arch/arm/dts/imx7d-colibri-emmc.dtsi
 rename arch/arm/dts/{imx7-colibri-u-boot.dtsi => imx7d-colibri-eval-v3-u-boot.dtsi} (79%)
 create mode 100644 arch/arm/dts/imx7d-colibri-eval-v3.dts
 create mode 100644 arch/arm/dts/imx7d-colibri.dtsi
 create mode 100644 arch/arm/dts/imx8mm-verdin-dahlia.dtsi
 create mode 100644 arch/arm/dts/imx8mm-verdin-dev.dtsi
 rename arch/arm/dts/{imx8mm-verdin-u-boot.dtsi => imx8mm-verdin-wifi-dev-u-boot.dtsi} (53%)
 create mode 100644 arch/arm/dts/imx8mm-verdin-wifi-dev.dts
 create mode 100644 arch/arm/dts/imx8mm-verdin-wifi.dtsi
 delete mode 100644 arch/arm/dts/imx8mm-verdin.dts
 create mode 100644 arch/arm/dts/imx8mm-verdin.dtsi
 create mode 100644 arch/arm/dts/imx8mp-verdin-dahlia.dtsi
 create mode 100644 arch/arm/dts/imx8mp-verdin-dev.dtsi
 rename arch/arm/dts/{imx8mp-verdin-u-boot.dtsi => imx8mp-verdin-wifi-dev-u-boot.dtsi} (66%)
 create mode 100644 arch/arm/dts/imx8mp-verdin-wifi-dev.dts
 create mode 100644 arch/arm/dts/imx8mp-verdin-wifi.dtsi
 delete mode 100644 arch/arm/dts/imx8mp-verdin.dts
 create mode 100644 arch/arm/dts/imx8mp-verdin.dtsi
 create mode 100644 arch/arm/dts/vf-colibri-eval-v3.dtsi
 delete mode 100644 arch/arm/dts/vf-colibri-u-boot.dtsi
 delete mode 100644 arch/arm/dts/vf.dtsi
 delete mode 100644 arch/arm/dts/vf500-colibri.dts
 create mode 100644 arch/arm/dts/vf500.dtsi
 create mode 100644 arch/arm/dts/vf610-colibri-eval-v3-u-boot.dtsi
 create mode 100644 arch/arm/dts/vf610-colibri-eval-v3.dts
 delete mode 100644 arch/arm/dts/vf610-colibri.dts
 create mode 100644 arch/arm/dts/vf610-colibri.dtsi
 create mode 100644 arch/arm/dts/vf610.dtsi
 create mode 100644 arch/arm/dts/vfxxx.dtsi
 create mode 100644 include/dt-bindings/clock/vf610-clock.h
 create mode 100644 include/dt-bindings/sound/tlv320aic31xx.h
Signature · 1 line
2.35.1
#1 lore raw

PATCH 1/26 board/BuR/brppt2: fix pwms property warning

From: Marcel Ziswiler <[email protected]>

Fix the following build-time pwms property warning:

w+arch/arm/dts/imx6dl-brppt2.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3

---

 arch/arm/dts/imx6dl-brppt2.dts | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/imx6dl-brppt2.dts +1 -0
index 4f1c52bff83..f515e4cc6ab 100644
@@ -165,6 +165,7 @@
 };
 
 &pwm4 {
+	#pwm-cells = <2>;
 	status = "okay";
 };
 
Signature · 1 line
2.35.1
#2 lore raw

PATCH 1/26 board/BuR/brppt2: fix pwms property warning

Quoted 5 lines

From: Marcel Ziswiler <[email protected]> Fix the following build-time pwms property warning:
w+arch/arm/dts/imx6dl-brppt2.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#3 lore raw

PATCH 2/26 imx6: aristainetos: fix pwms property warnings

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Fix the following build-time pwms property warnings:

w+arch/arm/dts/imx6dl-aristainetos2c_7.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6dl-aristainetos2c_cslb_7.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3

---

 arch/arm/dts/imx6qdl-aristainetos2-common.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/imx6qdl-aristainetos2-common.dtsi +1 -0
index 570143694e8..dd683dc2ca3 100644
@@ -344,6 +344,7 @@
 };
 
 &pwm1 {
+	#pwm-cells = <2>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm1>;
 	status = "okay";
Signature · 1 line
2.35.1
Reviewed-by on v1 2/26
#4 lore raw

Re: [PATCH v1 02/26] imx6: aristainetos: fix pwms property warnings

Hello Marcel,

Quoted 9 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Fix the following build-time pwms property warnings:

w+arch/arm/dts/imx6dl-aristainetos2c_7.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6dl-aristainetos2c_cslb_7.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3

Quoted 5 lines

---

 arch/arm/dts/imx6qdl-aristainetos2-common.dtsi | 1 +
 1 file changed, 1 insertion(+)

Thanks!

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: [email protected]
#5 lore raw

PATCH 2/26 imx6: aristainetos: fix pwms property warnings

In reply to Marcel Ziswiler
Quoted 8 lines

From: Marcel Ziswiler <[email protected]>
Fix the following build-time pwms property warnings:
w+arch/arm/dts/imx6dl-aristainetos2c_7.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx6dl-aristainetos2c_cslb_7.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#6 lore raw

PATCH 3/26 tbs2910: prepare to synchronise device trees with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

As a preparatory step make sure to refer to absolute node paths where labels were removed in Linux upstream.

This avoids the following error once synchronised:

+Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:3.1-7 Label or path aips1
not found
+Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:11.1-5 Label or path soc
not found

---

 arch/arm/dts/imx6q-tbs2910-u-boot.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/imx6q-tbs2910-u-boot.dtsi +2 -2
index 65ab052ac2c..d48719e7d59 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-&aips1 {
+&{/soc/bus@2000000} { /* AIPS1 */
 	u-boot,dm-pre-reloc;
 };
 
@@ -8,7 +8,7 @@
 	u-boot,dm-pre-reloc;
 };
 
-&soc {
+&{/soc} {
 	u-boot,dm-pre-reloc;
 };
 
Signature · 1 line
2.35.1
#7 lore raw

Re: [PATCH v1 03/26] tbs2910: prepare to synchronise device trees with linux

Quoted 4 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

As a preparatory step make sure to refer to absolute node paths where labels were removed in Linux upstream.

Are you sure that this was removed upstream?
It was just submitted for inclusion [1], and may not have landed yet.

Regards,
Soeren

[1]
https://lore.kernel.org/linux-arm-kernel/20220620003736.GN254723@dragon/T/

Quoted 35 lines

This avoids the following error once synchronised:

(quoted diff) +2 -0
+Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:3.1-7 Label or path aips1
  not found
+Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:11.1-5 Label or path soc
  not found

---

  arch/arm/dts/imx6q-tbs2910-u-boot.dtsi | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/imx6q-tbs2910-u-boot.dtsi +2 -2
index 65ab052ac2c..d48719e7d59 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0+
 
-&aips1 {
+&{/soc/bus@2000000} { /* AIPS1 */
  	u-boot,dm-pre-reloc;
  };
 
@@ -8,7 +8,7 @@
  	u-boot,dm-pre-reloc;
  };
 
-&soc {
+&{/soc} {
  	u-boot,dm-pre-reloc;
  };
 
#8 lore raw

Re: [PATCH v1 03/26] tbs2910: prepare to synchronise device trees with linux

Quoted 6 lines · Soeren Moch
Quoted 4 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

As a preparatory step make sure to refer to absolute node paths where labels were removed in Linux upstream.

Are you sure that this was removed upstream?

Well, removed or never been there and still not there up to and including latest v5.19-rc7.

Quoted 1 line

It was just submitted for inclusion [1], and may not have landed yet.

Oh, okay. No, haven't seen that one yet. So it might make sense to re-base everything on latest -next then which would no longer require such change. Let me re-work this in a v2. Thanks!

Quoted 2 lines

Regards,
Soeren

Cheers

Marcel

Quoted 36 lines

[1]
https://lore.kernel.org/linux-arm-kernel/20220620003736.GN254723@dragon/T/

Quoted 34 lines

This avoids the following error once synchronised:

+Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:3.1-7 Label or path aips1 not found
+Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:11.1-5 Label or path soc not found

---

  arch/arm/dts/imx6q-tbs2910-u-boot.dtsi | 4 ++--

  1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/imx6q-tbs2910-u-boot.dtsi +2 -2
index 65ab052ac2c..d48719e7d59 100644
@@ -1,6 +1,6 @@
   // SPDX-License-Identifier: GPL-2.0+
 
-&aips1 {
+&{/soc/bus@2000000} { /* AIPS1 */
         u-boot,dm-pre-reloc;
   };
 
@@ -8,7 +8,7 @@
         u-boot,dm-pre-reloc;
   };
 
-&soc {
+&{/soc} {
         u-boot,dm-pre-reloc;
   };
reviewer
#9 lore raw

Re: [PATCH v1 03/26] tbs2910: prepare to synchronise device trees with linux

Hi Marcel,

Quoted 2 lines · Marcel Ziswiler

Oh, okay. No, haven't seen that one yet. So it might make sense to re-base everything on latest -next then which would no longer require such change. Let me re-work this in a v2. Thanks!

Yes, please sync with linux-next.

linux-next has also an imx8mm/mq/mn/mp job ring fix for a problem that Andrey reported recently.

Thanks for working on this!

Cheers

#10 lore raw

Re: [PATCH v1 03/26] tbs2910: prepare to synchronise device trees with linux

Hi Fabio

Quoted 9 lines · Fabio Estevam

Hi Marcel,

Quoted 2 lines · Marcel Ziswiler

Oh, okay. No, haven't seen that one yet. So it might make sense to re-base everything on latest -next then which would no longer require such change. Let me re-work this in a v2. Thanks!

Yes, please sync with linux-next.

Sorry, I just returned from vacation and noticed (almost a little bit shocked) that this series has already been applied by Stefano and subsequently been pulled into master by Tom despite this ongoing discussion. I actually had a v2 almost ready before I left for vacation. Oh, well...

Anyway, now with Linux 5.19 out and it usually only taking up to two weeks for the next rc1 I plan to re-sync again once that is out and correct what Soeren reported here.

I might also include further imx targets which I added in my v2. Let's see...

Quoted 2 lines

linux-next has also an imx8mm/mq/mn/mp job ring fix for a problem that Andrey reported recently.

That will then also be included in my 6.0-rc1 re-sync (;-p).

Quoted 1 line

Thanks for working on this!

You are very welcome. And sorry again for the inconvenience this kinda pre-mature application/pull caused.

Quoted 1 line

Cheers

Cheers

Marcel

#11 lore raw

PATCH 3/26 tbs2910: prepare to synchronise device trees with linux

In reply to Marcel Ziswiler
Quoted 9 lines

From: Marcel Ziswiler <[email protected]>
As a preparatory step make sure to refer to absolute node paths where labels were removed in Linux upstream.
This avoids the following error once synchronised:

(quoted diff) +2 -0
+Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:3.1-7 Label or path aips1
 not found
+Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:11.1-5 Label or path soc
 not found

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#12 lore raw

Re: [PATCH v1 03/26] tbs2910: prepare to synchronise device trees with linux

Quoted 10 lines · On 25.07.22 18:42, [email protected] wrote:
Quoted 9 lines

From: Marcel Ziswiler <[email protected]>
As a preparatory step make sure to refer to absolute node paths where labels were removed in Linux upstream.
This avoids the following error once synchronised:

(quoted diff) +2 -0
+Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:3.1-7 Label or path aips1
  not found
+Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:11.1-5 Label or path soc
  not found

Applied to u-boot-imx, master, thanks !

What a nonsense!

We already discussed that it absolutely makes no sense to remove dt parts in u-boot that are accepted for linux and just not applied yet.

Just to prepare a synchronization. Really stupid!

Soeren

Quoted 4 lines

Best regards,
Stefano Babic

#13 lore raw

PATCH 4/26 imx6dl/imx6qdl: synchronise device trees with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device trees with linux-next next-20220708.

---

 arch/arm/dts/imx6-logicpd-baseboard.dtsi      |  12 +-
 arch/arm/dts/imx6-logicpd-som.dtsi            |   4 +
 arch/arm/dts/imx6dl-mamoj.dts                 | 273 +++++-
 arch/arm/dts/imx6dl-mba6.dtsi                 |  10 +-
 arch/arm/dts/imx6dl-mba6a.dts                 |  15 +-
 arch/arm/dts/imx6dl-mba6b.dts                 |  15 +-
 arch/arm/dts/imx6dl-nitrogen6x.dts            |  12 +-
 arch/arm/dts/imx6dl-pinfunc.h                 |   7 +-
 arch/arm/dts/imx6dl-riotboard.dts             |   2 +
 arch/arm/dts/imx6dl-sabreauto.dts             |  15 +
 arch/arm/dts/imx6dl-tqma6a.dtsi               |  12 +-
 arch/arm/dts/imx6dl-tqma6b.dtsi               |  12 +-
 arch/arm/dts/imx6dl.dtsi                      |  15 +-
 arch/arm/dts/imx6q-b450v3.dts                 |  19 +-
 arch/arm/dts/imx6q-b650v3.dts                 |  17 +-
 arch/arm/dts/imx6q-b850v3.dts                 |  23 +-
 arch/arm/dts/imx6q-ba16.dtsi                  |  18 +-
 arch/arm/dts/imx6q-bosch-acc.dts              |  14 +-
 arch/arm/dts/imx6q-bx50v3.dtsi                |  61 +-
 arch/arm/dts/imx6q-cm-fx6.dts                 | 112 ++-
 arch/arm/dts/imx6q-icore-ofcap10.dts          |  28 +-
 arch/arm/dts/imx6q-logicpd.dts                |  18 +-
 arch/arm/dts/imx6q-marsboard.dts              |   2 +-
 arch/arm/dts/imx6q-mba6.dtsi                  |  32 +-
 arch/arm/dts/imx6q-mba6a.dts                  |  14 +-
 arch/arm/dts/imx6q-mba6b.dts                  |  14 +-
 arch/arm/dts/imx6q-mccmon6.dts                | 213 +++--
 arch/arm/dts/imx6q-nitrogen6x.dts             |  12 +-
 arch/arm/dts/imx6q-novena.dts                 |  42 +-
 arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts   |   3 +
 arch/arm/dts/imx6q-pinfunc.h                  |   7 +-
 arch/arm/dts/imx6q-sabrelite.dts              |   6 +-
 arch/arm/dts/imx6q-tbs2910.dts                |   9 +-
 arch/arm/dts/imx6q-tqma6a.dtsi                |  12 +-
 arch/arm/dts/imx6q-tqma6b.dtsi                |  11 +-
 arch/arm/dts/imx6q.dtsi                       |  40 +-
 arch/arm/dts/imx6qdl-cubox-i.dtsi             |   5 +-
 arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi          |   6 +-
 arch/arm/dts/imx6qdl-dhcom-som.dtsi           |   8 +-
 arch/arm/dts/imx6qdl-gw51xx.dtsi              |   7 +-
 arch/arm/dts/imx6qdl-gw52xx.dtsi              |  10 +-
 arch/arm/dts/imx6qdl-gw53xx.dtsi              |  22 +-
 arch/arm/dts/imx6qdl-gw54xx.dtsi              |  22 +-
 arch/arm/dts/imx6qdl-gw551x.dtsi              |   7 +-
 arch/arm/dts/imx6qdl-gw552x.dtsi              |  29 +-
 arch/arm/dts/imx6qdl-gw553x.dtsi              |   5 +-
 arch/arm/dts/imx6qdl-gw560x.dtsi              |  14 +-
 arch/arm/dts/imx6qdl-gw5903.dtsi              |   6 -
 arch/arm/dts/imx6qdl-gw5904.dtsi              |  27 +-
 arch/arm/dts/imx6qdl-gw5907.dtsi              |   9 +-
 arch/arm/dts/imx6qdl-gw5910.dtsi              |   7 -
 arch/arm/dts/imx6qdl-gw5912.dtsi              |  22 +-
 arch/arm/dts/imx6qdl-gw5913.dtsi              |  10 +-
 arch/arm/dts/imx6qdl-hummingboard2.dtsi       |   2 +-
 arch/arm/dts/imx6qdl-icore.dtsi               |  19 +-
 arch/arm/dts/imx6qdl-mba6.dtsi                | 598 ++++++++++---
 arch/arm/dts/imx6qdl-mba6a.dtsi               |  35 +-
 arch/arm/dts/imx6qdl-mba6b.dtsi               |  40 +-
 arch/arm/dts/imx6qdl-nitrogen6x.dtsi          | 733 ++++++++++++++--
 .../dts/imx6qdl-phytec-mira-peb-av-02.dtsi    | 119 +++
 .../dts/imx6qdl-phytec-mira-peb-eval-01.dtsi  |  71 ++
 .../dts/imx6qdl-phytec-mira-peb-wlbt-05.dtsi  |  85 ++
 arch/arm/dts/imx6qdl-phytec-mira.dtsi         |  32 +-
 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi  |  30 +-
 arch/arm/dts/imx6qdl-pico.dtsi                | 226 ++++-
 arch/arm/dts/imx6qdl-sabreauto.dtsi           | 119 ++-
 arch/arm/dts/imx6qdl-sabrelite.dtsi           | 828 +++++++++++++-----
 arch/arm/dts/imx6qdl-sabresd.dtsi             | 214 +++--
 arch/arm/dts/imx6qdl-sr-som-ti.dtsi           |   1 +
 arch/arm/dts/imx6qdl-sr-som.dtsi              |  31 +-
 arch/arm/dts/imx6qdl-tqma6.dtsi               | 326 +++----
 arch/arm/dts/imx6qdl-tqma6a.dtsi              |  46 +-
 arch/arm/dts/imx6qdl-tqma6b.dtsi              |  28 +-
 arch/arm/dts/imx6qdl-udoo.dtsi                |   4 +-
 arch/arm/dts/imx6qdl-wandboard-revd1.dtsi     |   2 -
 arch/arm/dts/imx6qdl-wandboard.dtsi           | 102 ++-
 arch/arm/dts/imx6qdl.dtsi                     | 194 ++--
 include/dt-bindings/clock/imx6qdl-clock.h     |  14 +-
 78 files changed, 3953 insertions(+), 1293 deletions(-)
 create mode 100644 arch/arm/dts/imx6qdl-phytec-mira-peb-av-02.dtsi
 create mode 100644 arch/arm/dts/imx6qdl-phytec-mira-peb-eval-01.dtsi
 create mode 100644 arch/arm/dts/imx6qdl-phytec-mira-peb-wlbt-05.dtsi
arch/arm/dts/imx6-logicpd-baseboard.dtsi +8 -4
index c40a7af6ebe..d9de9b4f0c5 100644
@@ -212,6 +212,7 @@
 &ecspi1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_ecspi1>;
+	cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>;
 	status = "disabled";
 };
 
@@ -237,7 +238,6 @@
 		compatible = "wlf,wm8962";
 		reg = <0x1a>;
 		clocks = <&clks IMX6QDL_CLK_CKO>;
-		clock-names = "xclk";
 		DCVDD-supply = <&reg_audio>;
 		DBVDD-supply = <&reg_audio>;
 		AVDD-supply = <&reg_audio>;
@@ -249,9 +249,9 @@
 		gpio-cfg = <
 			0x0000 /* 0:Default */
 			0x0000 /* 1:Default */
-			0x0013 /* 2:FN_DMICCLK */
+			0x0000 /* 2:FN_DMICCLK */
 			0x0000 /* 3:Default */
-			0x8014 /* 4:FN_DMICCDAT */
+			0x0000 /* 4:FN_DMICCDAT */
 			0x0000 /* 5:Default */
 		>;
 	};
@@ -328,6 +328,10 @@
 	pinctrl-0 = <&pinctrl_pwm3>;
 };
 
+&snvs_pwrkey {
+	status = "okay";
+};
+
 &ssi2 {
 	status = "okay";
 };
@@ -379,7 +383,7 @@
 			MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK	0x100b1
 			MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI	0x100b1
 			MX6QDL_PAD_KEY_COL1__ECSPI1_MISO	0x100b1
-			MX6QDL_PAD_KEY_ROW1__ECSPI1_SS0		0x100b1
+			MX6QDL_PAD_KEY_ROW1__GPIO4_IO09		0x1b0b0
 		>;
 	};
 
arch/arm/dts/imx6-logicpd-som.dtsi +4 -0
index 7ceae357324..547fb141ec0 100644
@@ -207,6 +207,10 @@
 	vin-supply = <&sw1c_reg>;
 };
 
+&snvs_poweroff {
+	status = "okay";
+};
+
 &iomuxc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_hog>;
arch/arm/dts/imx6dl-mamoj.dts +272 -1

313 lines not on this page · raw message

arch/arm/dts/imx6dl-mba6.dtsi +7 -3
index d74adf2b288..b749b424bbd 100644
@@ -1,6 +1,10 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ *
+ * Copyright 2013-2021 TQ-Systems GmbH
+ * Author: Markus Niebel <[email protected]>
+ */
 
 &ethphy {
 	rxdv-skew-ps = <180>;
arch/arm/dts/imx6dl-mba6a.dts +10 -5
index fc9cc2c056f..df0a96b28af 100644
@@ -1,6 +1,10 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ *
+ * Copyright 2013-2021 TQ-Systems GmbH
+ * Author: Markus Niebel <[email protected]>
+ */
 
 /dts-v1/;
 
@@ -11,6 +15,7 @@
 #include "imx6dl-mba6.dtsi"
 
 / {
-	model = "TQ TQMa6S on MBa6x";
-	compatible = "tq,mba6a", "tq,tqma6dl", "fsl,imx6dl";
+	model = "TQ TQMa6S/DL on MBa6x";
+	compatible = "tq,imx6dl-mba6x-a", "tq,mba6a",
+		     "tq,imx6dl-tqma6dl-a", "fsl,imx6dl";
 };
arch/arm/dts/imx6dl-mba6b.dts +10 -5
index a3c8d9d4c6b..610b19d2db0 100644
@@ -1,6 +1,10 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ *
+ * Copyright 2013-2021 TQ-Systems GmbH
+ * Author: Markus Niebel <[email protected]>
+ */
 
 /dts-v1/;
 
@@ -11,6 +15,7 @@
 #include "imx6dl-mba6.dtsi"
 
 / {
-	model = "TQ TQMa6S on MBa6x";
-	compatible = "tq,mba6b", "tq,tqma6dl", "fsl,imx6dl";
+	model = "TQ TQMa6S/DL on MBa6x";
+	compatible = "tq,imx6dl-mba6x-b", "tq,mba6b",
+		     "tq,imx6dl-tqma6dl-b", "fsl,imx6dl";
 };
arch/arm/dts/imx6dl-nitrogen6x.dts +6 -6
index 9427ab6399b..ef58d3b0ea0 100644
@@ -1,11 +1,11 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright 2013-2019 Boundary Devices, Inc.
-// Copyright 2012 Freescale Semiconductor, Inc.
-// Copyright 2011 Linaro Ltd.
+// SPDX-License-Identifier: GPL-2.0 OR X11
+/*
+ * Copyright 2013 Boundary Devices, Inc.
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ */
 
 /dts-v1/;
-
 #include "imx6dl.dtsi"
 #include "imx6qdl-nitrogen6x.dtsi"
 
arch/arm/dts/imx6dl-pinfunc.h +2 -5
index 0ead323fdbd..9d88d09f9bf 100644
@@ -1,10 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright 2013 Freescale Semiconductor, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  */
 
 #ifndef __DTS_IMX6DL_PINFUNC_H
@@ -668,6 +664,7 @@
 #define MX6QDL_PAD_ENET_RX_ER__SPDIF_IN             0x1f4 0x5c4 0x8f0 0x3 0x1
 #define MX6QDL_PAD_ENET_RX_ER__ENET_1588_EVENT2_OUT 0x1f4 0x5c4 0x000 0x4 0x0
 #define MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24           0x1f4 0x5c4 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_RXD0__OSC32K_32K_OUT        0x1f8 0x5c8 0x000 0x0 0x0
 #define MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0         0x1f8 0x5c8 0x818 0x1 0x0
 #define MX6QDL_PAD_ENET_RXD0__ESAI_TX_HF_CLK        0x1f8 0x5c8 0x838 0x2 0x0
 #define MX6QDL_PAD_ENET_RXD0__SPDIF_OUT             0x1f8 0x5c8 0x000 0x3 0x0
arch/arm/dts/imx6dl-riotboard.dts +2 -0
index 065d3ab0f50..e7d9bfbfd0e 100644
@@ -106,6 +106,8 @@
 			reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
 			reset-assert-us = <10000>;
 			reset-deassert-us = <1000>;
+			qca,smarteee-tw-us-1g = <24>;
+			qca,clk-out-frequency = <125000000>;
 		};
 	};
 };
arch/arm/dts/imx6dl-sabreauto.dts +15 -0
index 660d52a245b..ff3283c83a3 100644
@@ -11,3 +11,18 @@
 	model = "Freescale i.MX6 DualLite/Solo SABRE Automotive Board";
 	compatible = "fsl,imx6dl-sabreauto", "fsl,imx6dl";
 };
+
+&cpu0 {
+	operating-points = <
+		/* kHz    uV */
+		996000  1275000
+		792000  1175000
+		396000  1150000
+	>;
+	fsl,soc-operating-points = <
+		/* ARM kHz  SOC-PU uV */
+		996000	1200000
+		792000	1175000
+		396000	1175000
+	>;
+};
arch/arm/dts/imx6dl-tqma6a.dtsi +7 -5
index df87b381cae..e891ef9b009 100644
@@ -1,14 +1,16 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ * Copyright 2013-2017 Markus Niebel <[email protected]>
+ */
 
 #include "imx6dl.dtsi"
 #include "imx6qdl-tqma6a.dtsi"
 #include "imx6qdl-tqma6.dtsi"
 
 / {
-	memory {
+	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};
 };
-
arch/arm/dts/imx6dl-tqma6b.dtsi +7 -5
index 47ffbc4d952..38cd8501a88 100644
@@ -1,14 +1,16 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ * Copyright 2013-2017 Markus Niebel <[email protected]>
+ */
 
 #include "imx6dl.dtsi"
 #include "imx6qdl-tqma6b.dtsi"
 #include "imx6qdl-tqma6.dtsi"
 
 / {
-	memory {
+	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};
 };
-
arch/arm/dts/imx6dl.dtsi +9 -6
index ae5aad6b9ef..8e0ed209ede 100644
@@ -15,7 +15,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		cpu@0 {
+		cpu0: cpu@0 {
 			compatible = "arm,cortex-a9";
 			device_type = "cpu";
 			reg = <0>;
@@ -44,6 +44,8 @@
 			arm-supply = <&reg_arm>;
 			pu-supply = <&reg_pu>;
 			soc-supply = <&reg_soc>;
+			nvmem-cells = <&cpu_speed_grade>;
+			nvmem-cell-names = "speed_grade";
 		};
 
 		cpu@1 {
@@ -64,6 +66,7 @@
 				396000	1175000
 			>;
 			clock-latency = <61036>; /* two CLK32 periods */
+			#cooling-cells = <2>;
 			clocks = <&clks IMX6QDL_CLK_ARM>,
 				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
 				 <&clks IMX6QDL_CLK_STEP>,
@@ -77,7 +80,7 @@
 		};
 	};
 
-	soc {
+	soc: soc {
 		ocram: sram@900000 {
 			compatible = "mmio-sram";
 			reg = <0x00900000 0x20000>;
@@ -85,10 +88,6 @@
 		};
 
 		aips1: bus@2000000 {
-			iomuxc: iomuxc@20e0000 {
-				compatible = "fsl,imx6dl-iomuxc";
-			};
-
 			pxp: pxp@20f0000 {
 				reg = <0x020f0000 0x4000>;
 				interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -295,6 +294,10 @@
 	compatible = "fsl,imx6dl-hdmi";
 };
 
+&iomuxc {
+	compatible = "fsl,imx6dl-iomuxc";
+};
+
 &ipu1_csi1 {
 	ipu1_csi1_from_ipu1_csi1_mux: endpoint {
 		remote-endpoint = <&ipu1_csi1_mux_to_ipu1_csi1>;
arch/arm/dts/imx6q-b450v3.dts +7 -12
index 995caa8a331..d994b32ad82 100644
@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2015 Timesys Corporation.
  * Copyright 2015 General Electric Company
@@ -66,13 +65,6 @@
 	};
 };
 
-&clks {
-	assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,
-			  <&clks IMX6QDL_CLK_LDB_DI1_SEL>;
-	assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>,
-				 <&clks IMX6QDL_CLK_PLL3_USB_OTG>;
-};
-
 &ldb {
 	status = "okay";
 
@@ -92,14 +84,19 @@
 };
 
 &pca9539 {
-	P04 {
+	gpio-line-names = "AMB_P_INT1#", "AMB_P_INT2#", "BT_EN", "WLAN_EN",
+			  "", "SM_D_ACT", "DP1_RST#", "",
+			  "WD15S_EN", "WD15S_DIS#", "", "",
+			  "", "", "", "";
+
+	P04-hog {
 		gpio-hog;
 		gpios = <4 0>;
 		output-low;
 		line-name = "PCA9539-P04";
 	};
 
-	P07 {
+	P07-hog {
 		gpio-hog;
 		gpios = <7 0>;
 		output-low;
@@ -158,5 +155,3 @@
 		};
 	};
 };
-
-#include "imx6q-bx50v3-uboot.dtsi"
arch/arm/dts/imx6q-b650v3.dts +6 -11
index 95a61347da5..fa1a1df37cd 100644
@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2015 Timesys Corporation.
  * Copyright 2015 General Electric Company
@@ -66,13 +65,6 @@
 	};
 };
 
-&clks {
-	assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,
-			  <&clks IMX6QDL_CLK_LDB_DI1_SEL>;
-	assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>,
-				 <&clks IMX6QDL_CLK_PLL3_USB_OTG>;
-};
-
 &ldb {
 	status = "okay";
 
@@ -92,7 +84,12 @@
 };
 
 &pca9539 {
-	P07 {
+	gpio-line-names = "AMB_P_INT1#", "AMB_P_INT2#", "BT_EN", "WLAN_EN",
+			  "", "SM_D_ACT", "DP1_RST#", "",
+			  "WD15S_EN", "WD15S_DIS#", "", "",
+			  "", "", "", "";
+
+	P07-hog {
 		gpio-hog;
 		gpios = <7 0>;
 		output-low;
@@ -157,5 +154,3 @@
 		};
 	};
 };
-
-#include "imx6q-bx50v3-uboot.dtsi"
arch/arm/dts/imx6q-b850v3.dts +7 -16
index 6416825234b..db8c332df6a 100644
@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2015 Timesys Corporation.
  * Copyright 2015 General Electric Company
@@ -54,17 +53,6 @@
 	};
 };
 
-&clks {
-	assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,
-			  <&clks IMX6QDL_CLK_LDB_DI1_SEL>,
-			  <&clks IMX6QDL_CLK_IPU1_DI0_PRE_SEL>,
-			  <&clks IMX6QDL_CLK_IPU2_DI0_PRE_SEL>;
-	assigned-clock-parents = <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>,
-				 <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>,
-				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
-				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>;
-};
-
 &ldb {
 	fsl,dual-channel;
 	status = "okay";
@@ -211,14 +199,19 @@
 };
 
 &pca9539 {
-	P10 {
+	gpio-line-names = "AMB_P_INT1#", "AMB_P_INT2#", "BT_EN", "WLAN_EN",
+			  "REMOTE_ON_PML#", "SM_D_ACT", "DP1_RST#", "DP2_RST#",
+			  "", "", "", "",
+			  "", "", "", "";
+
+	P10-hog {
 		gpio-hog;
 		gpios = <8 0>;
 		output-low;
 		line-name = "PCA9539-P10";
 	};
 
-	P11 {
+	P11-hog {
 		gpio-hog;
 		gpios = <9 0>;
 		output-low;
@@ -300,5 +293,3 @@
 		phy-handle = <&switchphy4>;
 	};
 };
-
-#include "imx6q-bx50v3-uboot.dtsi"
arch/arm/dts/imx6q-ba16.dtsi +14 -4
index 9da2bb6e869..f266f1b7e0c 100644
@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Support for imx6 based Advantech DMS-BA16 Qseven module
  *
@@ -125,6 +124,9 @@
 		regulator-name = "usb_otg_vbus";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
+		pinctrl-0 = <&pinctrl_usbotg_vbus>;
+		gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
 	};
 };
 
@@ -135,12 +137,12 @@
 };
 
 &ecspi1 {
-	cs-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;
+	cs-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_ecspi1>;
 	status = "okay";
 
-	flash: n25q032@0 {
+	flash: flash@0 {
 		compatible = "jedec,spi-nor";
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -173,8 +175,9 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
-	status = "okay";
+	phy-supply = <&reg_3p3v>;
 	phy-handle = <&phy0>;
+	status = "okay";
 
 	mdio {
 		#address-cells = <1>;
@@ -346,6 +349,7 @@
 };
 
 &pwm1 {
+	#pwm-cells = <2>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm1>;
 	status = "okay";
@@ -586,6 +590,12 @@
 		>;
 	};
 
+	pinctrl_usbotg_vbus: usbotgvbusgrp {
+		fsl,pins = <
+			MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x000b0
+		>;
+	};
+
 	pinctrl_usdhc2: usdhc2grp {
 		fsl,pins = <
 			MX6QDL_PAD_SD2_CMD__SD2_CMD	0x17059
arch/arm/dts/imx6q-bosch-acc.dts +12 -2
index 1bd4ef2fe4e..8263bfef9bf 100644
@@ -554,13 +554,23 @@
 	status = "okay";
 };
 
+&usbphynop1 {
+	clocks = <&clks IMX6QDL_CLK_USBPHY1>;
+	clock-names = "main_clk";
+	vcc-supply = <&reg_usb_h1_vbus>;
+};
+
+&usbphynop2 {
+	vcc-supply = <&reg_usb_h2_vbus>;
+};
+
 &usdhc2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc2>;
 	cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
 	no-1-8-v;
 	keep-power-in-suspend;
-	enable-sdio-wakeup;
+	wakeup-source;
 	voltage-ranges = <3300 3300>;
 	vmmc-supply = <&reg_sw4>;
 	fsl,wp-controller;
@@ -584,7 +594,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_wdog1>;
 	fsl,ext-reset-output;
-	timeout-sec=<10>;
+	timeout-sec = <10>;
 	status = "okay";
 };
 
arch/arm/dts/imx6q-bx50v3.dtsi +44 -17

161 lines not on this page · raw message

arch/arm/dts/imx6q-cm-fx6.dts +100 -12

144 lines not on this page · raw message

arch/arm/dts/imx6q-icore-ofcap10.dts +16 -12
index 81cc346dd14..02aca1e28ce 100644
@@ -12,6 +12,17 @@
 / {
 	model = "Engicam i.CoreM6 Quad/Dual OpenFrame Capacitive touch 10.1 Kit";
 	compatible = "engicam,imx6-icore", "fsl,imx6q";
+
+	panel {
+		compatible = "ampire,am-1280800n3tzqw-t00h";
+		backlight = <&backlight_lvds>;
+
+		port {
+			panel_in: endpoint {
+				remote-endpoint = <&lvds0_out>;
+			};
+		};
+	};
 };
 
 &ldb {
@@ -22,18 +33,11 @@
 		fsl,data-width = <24>;
 		status = "okay";
 
-		display-timings {
-			native-mode = <&timing0>;
-			timing0: timing0 {
-				clock-frequency = <60000000>;
-				hactive = <1280>;
-				vactive = <800>;
-				hback-porch = <40>;
-				hfront-porch = <40>;
-				vback-porch = <10>;
-				vfront-porch = <3>;
-				hsync-len = <80>;
-				vsync-len = <10>;
+		port@4 {
+			reg = <4>;
+
+			lvds0_out: endpoint {
+				remote-endpoint = <&panel_in>;
 			};
 		};
 	};
arch/arm/dts/imx6q-logicpd.dts +14 -4
index 45eb0b7f75f..46a4ddedb42 100644
@@ -9,11 +9,11 @@
 
 / {
 	model = "Logic PD i.MX6QD SOM-M3";
-	compatible = "fsl,imx6q";
+	compatible = "logicpd,imx6q-logicpd", "fsl,imx6q";
 
 	backlight: backlight-lvds {
 		compatible = "pwm-backlight";
-		pwms = <&pwm3 0 20000>;
+		pwms = <&pwm3 0 20000 0>;
 		brightness-levels = <0 4 8 16 32 64 128 255>;
 		default-brightness-level = <6>;
 		power-supply = <&reg_lcd>;
@@ -21,6 +21,8 @@
 
 	panel-lvds0 {
 		compatible = "okaya,rs800480t-7x0gp";
+		power-supply = <&reg_lcd_reset>;
+		backlight = <&backlight>;
 
 		port {
 			panel_in_lvds0: endpoint {
@@ -38,7 +40,6 @@
 		regulator-max-microvolt = <3300000>;
 		gpio = <&gpio4 17 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
-		regulator-always-on;
 		vin-supply = <&reg_3v3>;
 		startup-delay-us = <500000>;
 	};
@@ -52,7 +53,6 @@
 		regulator-max-microvolt = <3300000>;
 		gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
-		regulator-always-on;
 		vin-supply = <&reg_lcd>;
 	};
 };
@@ -73,6 +73,16 @@
 	status = "okay";
 };
 
+&i2c1 {
+	touchscreen@26 {
+		compatible = "ilitek,ili2117";
+		reg = <0x26>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_touchscreen>;
+		interrupts-extended = <&gpio1 6 IRQ_TYPE_EDGE_RISING>;
+	};
+};
+
 &ldb {
 	status = "okay";
 
arch/arm/dts/imx6q-marsboard.dts +1 -1
index 05ee2838822..cc180100239 100644
@@ -100,7 +100,7 @@
 	cs-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;
 	status = "okay";
 
-	m25p80@0 {
+	flash@0 {
 		compatible = "microchip,sst25vf016b";
 		spi-max-frequency = <20000000>;
 		reg = <0>;
arch/arm/dts/imx6q-mba6.dtsi +29 -3
index 76e8410f8ed..0d7be456729 100644
@@ -1,6 +1,16 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ *
+ * Copyright 2013-2021 TQ-Systems GmbH
+ * Author: Markus Niebel <[email protected]>
+ */
+
+&ecspi5 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_ecspi5_mba6x>;
+	cs-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
+};
 
 &ethphy {
 	rxdv-skew-ps = <180>;
@@ -16,3 +26,19 @@
 	txc-skew-ps = <1860>;
 	rxc-skew-ps = <1860>;
 };
+
+&sata {
+	status = "okay";
+};
+
+&iomuxc {
+	pinctrl_ecspi5_mba6x: ecspi5grp-mba6x {
+		fsl,pins = <
+			/* HYS, SPEED = MED, 100k up, DSE = 011, SRE_FAST */
+			MX6QDL_PAD_SD1_DAT0__ECSPI5_MISO 0x1b099
+			MX6QDL_PAD_SD1_CMD__ECSPI5_MOSI 0xb099
+			MX6QDL_PAD_SD1_CLK__ECSPI5_SCLK 0xb099
+			MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0xb099 /* eCSPI5 SS0 */
+		>;
+	};
+};
arch/arm/dts/imx6q-mba6a.dts +9 -5
index 7983ad94f82..349a08605a5 100644
@@ -1,10 +1,13 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ *
+ * Copyright 2013-2021 TQ-Systems GmbH
+ * Author: Markus Niebel <[email protected]>
+ */
 
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
 #include "imx6q-tqma6a.dtsi"
 #include "imx6qdl-mba6.dtsi"
 #include "imx6qdl-mba6a.dtsi"
@@ -12,5 +15,6 @@
 
 / {
 	model = "TQ TQMa6Q on MBa6x";
-	compatible = "tq,mba6a", "fsl,imx6q";
+	compatible = "tq,imx6q-mba6x-a", "tq,mba6a",
+		     "tq,imx6q-tqma6q-a", "fsl,imx6q";
 };
arch/arm/dts/imx6q-mba6b.dts +9 -5
index 9d117dd190f..02c9f3e91b8 100644
@@ -1,10 +1,13 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ *
+ * Copyright 2013-2021 TQ-Systems GmbH
+ * Author: Markus Niebel <[email protected]>
+ */
 
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
 #include "imx6q-tqma6b.dtsi"
 #include "imx6qdl-mba6.dtsi"
 #include "imx6qdl-mba6b.dtsi"
@@ -12,5 +15,6 @@
 
 / {
 	model = "TQ TQMa6Q on MBa6x";
-	compatible = "tq,mba6b", "fsl,imx6q";
+	compatible = "tq,imx6q-mba6x-b", "tq,mba6b",
+		     "tq,imx6q-tqma6q-b", "fsl,imx6q";
 };
arch/arm/dts/imx6q-mccmon6.dts +150 -63

274 lines not on this page · raw message

arch/arm/dts/imx6q-nitrogen6x.dts +6 -6
index ebb22a404ef..435445a34ad 100644
@@ -1,11 +1,11 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright 2013-2019 Boundary Devices, Inc.
-// Copyright 2012 Freescale Semiconductor, Inc.
-// Copyright 2011 Linaro Ltd.
+// SPDX-License-Identifier: GPL-2.0 OR X11
+/*
+ * Copyright 2013 Boundary Devices, Inc.
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ */
 
 /dts-v1/;
-
 #include "imx6q.dtsi"
 #include "imx6qdl-nitrogen6x.dtsi"
 
arch/arm/dts/imx6q-novena.dts +24 -18

68 lines not on this page · raw message

arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts +3 -0
index 65d2e483c13..3f13726c805 100644
@@ -8,6 +8,9 @@
 #include "imx6q.dtsi"
 #include "imx6qdl-phytec-phycore-som.dtsi"
 #include "imx6qdl-phytec-mira.dtsi"
+#include "imx6qdl-phytec-mira-peb-eval-01.dtsi"
+#include "imx6qdl-phytec-mira-peb-av-02.dtsi"
+#include "imx6qdl-phytec-mira-peb-wlbt-05.dtsi"
 
 / {
 	model = "PHYTEC phyBOARD-Mira Quad Carrier-Board with NAND";
arch/arm/dts/imx6q-pinfunc.h +2 -5
index 9fc6120a185..e40409d04b9 100644
@@ -1,10 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright 2013 Freescale Semiconductor, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  */
 
 #ifndef __DTS_IMX6Q_PINFUNC_H
@@ -551,6 +547,7 @@
 #define MX6QDL_PAD_ENET_RXD1__ESAI_TX_FS            0x1e0 0x4f4 0x860 0x2 0x0
 #define MX6QDL_PAD_ENET_RXD1__ENET_1588_EVENT3_OUT  0x1e0 0x4f4 0x000 0x4 0x0
 #define MX6QDL_PAD_ENET_RXD1__GPIO1_IO26            0x1e0 0x4f4 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_RXD0__OSC32K_32K_OUT        0x1e4 0x4f8 0x000 0x0 0x0
 #define MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0         0x1e4 0x4f8 0x848 0x1 0x1
 #define MX6QDL_PAD_ENET_RXD0__ESAI_TX_HF_CLK        0x1e4 0x4f8 0x868 0x2 0x0
 #define MX6QDL_PAD_ENET_RXD0__SPDIF_OUT             0x1e4 0x4f8 0x000 0x3 0x0
arch/arm/dts/imx6q-sabrelite.dts +5 -1
index 91e031c7ca8..434b1433e79 100644
@@ -5,7 +5,6 @@
 // Copyright 2011 Linaro Ltd.
 
 /dts-v1/;
-
 #include "imx6q.dtsi"
 #include "imx6qdl-sabrelite.dtsi"
 
@@ -17,3 +16,8 @@
 &sata {
 	status = "okay";
 };
+
+&ipu1_csi1_from_mipi_vc1 {
+	clock-lanes = <0>;
+	data-lanes = <1 2>;
+};
arch/arm/dts/imx6q-tbs2910.dts +5 -4
index 7d0a0676ff7..8daef65d5bb 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+ OR MIT
 //
-// Copyright 2014-2019 Soeren Moch <[email protected]>
+// Copyright 2014 Soeren Moch <[email protected]>
 
 /dts-v1/;
 
@@ -20,7 +20,7 @@
 		mmc0 = &usdhc2;
 		mmc1 = &usdhc3;
 		mmc2 = &usdhc4;
-		usb0 = &usbotg;
+		/delete-property/ mmc3;
 	};
 
 	memory@10000000 {
@@ -106,7 +106,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
-	phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
 	phy-handle = <&phy>;
 	status = "okay";
 
@@ -117,6 +116,8 @@
 		phy: ethernet-phy@4 {
 			reg = <4>;
 			qca,clk-out-frequency = <125000000>;
+			reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
+			reset-assert-us = <10000>;
 		};
 	};
 };
@@ -158,7 +159,7 @@
 	pinctrl-0 = <&pinctrl_i2c3>;
 	status = "okay";
 
-	rtc: ds1307@68 {
+	rtc: rtc@68 {
 		compatible = "dallas,ds1307";
 		reg = <0x68>;
 	};
arch/arm/dts/imx6q-tqma6a.dtsi +7 -5
index b252077f499..ab4c07c13a1 100644
@@ -1,14 +1,16 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ * Copyright 2013-2017 Markus Niebel <[email protected]>
+ */
 
 #include "imx6q.dtsi"
 #include "imx6qdl-tqma6a.dtsi"
 #include "imx6qdl-tqma6.dtsi"
 
 / {
-	memory {
+	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 };
-
arch/arm/dts/imx6q-tqma6b.dtsi +6 -5
index 107a9eb037e..7224c376c31 100644
@@ -1,14 +1,15 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2020 TQ-Systems GmbH
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright 2013 Sascha Hauer, Pengutronix
+ */
 
 #include "imx6q.dtsi"
 #include "imx6qdl-tqma6b.dtsi"
 #include "imx6qdl-tqma6.dtsi"
 
 / {
-	memory {
+	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 };
-
arch/arm/dts/imx6q.dtsi +23 -17
index c37484dce35..3b77eae40e3 100644
@@ -9,7 +9,6 @@
 / {
 	aliases {
 		ipu1 = &ipu2;
-		video1 = &ipu2;
 		spi4 = &ecspi5;
 	};
 
@@ -50,6 +49,8 @@
 			arm-supply = <&reg_arm>;
 			pu-supply = <&reg_pu>;
 			soc-supply = <&reg_soc>;
+			nvmem-cells = <&cpu_speed_grade>;
+			nvmem-cell-names = "speed_grade";
 		};
 
 		cpu1: cpu@1 {
@@ -74,6 +75,7 @@
 				396000	1175000
 			>;
 			clock-latency = <61036>; /* two CLK32 periods */
+			#cooling-cells = <2>;
 			clocks = <&clks IMX6QDL_CLK_ARM>,
 				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
 				 <&clks IMX6QDL_CLK_STEP>,
@@ -108,6 +110,7 @@
 				396000	1175000
 			>;
 			clock-latency = <61036>; /* two CLK32 periods */
+			#cooling-cells = <2>;
 			clocks = <&clks IMX6QDL_CLK_ARM>,
 				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
 				 <&clks IMX6QDL_CLK_STEP>,
@@ -142,6 +145,7 @@
 				396000	1175000
 			>;
 			clock-latency = <61036>; /* two CLK32 periods */
+			#cooling-cells = <2>;
 			clocks = <&clks IMX6QDL_CLK_ARM>,
 				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
 				 <&clks IMX6QDL_CLK_STEP>,
@@ -155,14 +159,14 @@
 		};
 	};
 
-	soc {
+	soc: soc {
 		ocram: sram@900000 {
 			compatible = "mmio-sram";
 			reg = <0x00900000 0x40000>;
 			clocks = <&clks IMX6QDL_CLK_OCRAM>;
 		};
 
-		bus@2000000 { /* AIPS1 */
+		aips1: bus@2000000 { /* AIPS1 */
 			spba-bus@2000000 {
 				ecspi5: spi@2018000 {
 					#address-cells = <1>;
@@ -173,15 +177,11 @@
 					clocks = <&clks IMX6Q_CLK_ECSPI5>,
 						 <&clks IMX6Q_CLK_ECSPI5>;
 					clock-names = "ipg", "per";
-					dmas = <&sdma 11 8 1>, <&sdma 12 8 2>;
+					dmas = <&sdma 11 7 1>, <&sdma 12 7 2>;
 					dma-names = "rx", "tx";
 					status = "disabled";
 				};
 			};
-
-			iomuxc: iomuxc@20e0000 {
-				compatible = "fsl,imx6q-iomuxc";
-			};
 		};
 
 		sata: sata@2200000 {
@@ -406,23 +406,29 @@
 &hdmi {
 	compatible = "fsl,imx6q-hdmi";
 
-	port@2 {
-		reg = <2>;
+	ports {
+		port@2 {
+			reg = <2>;
 
-		hdmi_mux_2: endpoint {
-			remote-endpoint = <&ipu2_di0_hdmi>;
+			hdmi_mux_2: endpoint {
+				remote-endpoint = <&ipu2_di0_hdmi>;
+			};
 		};
-	};
 
-	port@3 {
-		reg = <3>;
+		port@3 {
+			reg = <3>;
 
-		hdmi_mux_3: endpoint {
-			remote-endpoint = <&ipu2_di1_hdmi>;
+			hdmi_mux_3: endpoint {
+				remote-endpoint = <&ipu2_di1_hdmi>;
+			};
 		};
 	};
 };
 
+&iomuxc {
+	compatible = "fsl,imx6q-iomuxc";
+};
+
 &ipu1_csi1 {
 	ipu1_csi1_from_mipi_vc1: endpoint {
 		remote-endpoint = <&mipi_vc1_to_ipu1_csi1>;
arch/arm/dts/imx6qdl-cubox-i.dtsi +3 -2
index e3be453d8a4..1e530d892b7 100644
@@ -55,12 +55,12 @@
 		pinctrl-0 = <&pinctrl_cubox_i_ir>;
 	};
 
-	pwmleds {
+	led-controller {
 		compatible = "pwm-leds";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_cubox_i_pwm1>;
 
-		front {
+		led-1 {
 			active-low;
 			label = "imx6:red:front";
 			max-brightness = <248>;
@@ -233,6 +233,7 @@
 };
 
 &pwm1 {
+	#pwm-cells = <2>;
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi +5 -1
index bf6b3a5ce07..fe72650295a 100644
@@ -5,9 +5,9 @@
  */
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/pwm/pwm.h>
-#include <dt-bindings/input/input.h>
 
 / {
 	chosen {
@@ -263,6 +263,10 @@
 	status = "okay";
 };
 
+&usbh1 {
+	disable-over-current;
+};
+
 &usdhc2 { /* SD card */
 	status = "okay";
 };
arch/arm/dts/imx6qdl-dhcom-som.dtsi +5 -3
index 5d10c40313c..5befbe13d1a 100644
@@ -132,14 +132,15 @@
 		#size-cells = <0>;
 
 		ethphy0: ethernet-phy@0 { /* SMSC LAN8710Ai */
-			compatible = "ethernet-phy-ieee802.3-c22";
+			compatible = "ethernet-phy-id0007.c0f0",
+				     "ethernet-phy-ieee802.3-c22";
 			interrupt-parent = <&gpio4>;
 			interrupts = <15 IRQ_TYPE_LEVEL_LOW>;
 			pinctrl-0 = <&pinctrl_ethphy0>;
 			pinctrl-names = "default";
 			reg = <0>;
-			reset-assert-us = <1000>;
-			reset-deassert-us = <1000>;
+			reset-assert-us = <500>;
+			reset-deassert-us = <500>;
 			reset-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
 			smsc,disable-energy-detect; /* Make plugin detection reliable */
 		};
@@ -728,6 +729,7 @@
 	pinctrl_usbh1: usbh1-grp {
 		fsl,pins = <
 			MX6QDL_PAD_EIM_D31__GPIO3_IO31		0x120b0
+			MX6QDL_PAD_EIM_D30__USB_H1_OC		0x1b0b1
 		>;
 	};
 
arch/arm/dts/imx6qdl-gw51xx.dtsi +2 -5
index 139ffe012dc..069c27fab43 100644
@@ -13,8 +13,8 @@
 		led0 = &led0;
 		led1 = &led1;
 		nand = &gpmi;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -129,8 +129,6 @@
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <300>;
 	status = "okay";
 };
 
@@ -452,7 +450,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw52xx.dtsi +2 -8
index 1b5c836ff39..b1df2beb283 100644
@@ -13,11 +13,10 @@
 		led0 = &led0;
 		led1 = &led1;
 		led2 = &led2;
-		mmc0 = &usdhc3;
 		nand = &gpmi;
 		ssi0 = &ssi1;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -33,8 +32,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -195,8 +192,6 @@
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <300>;
 	status = "okay";
 };
 
@@ -547,7 +542,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw53xx.dtsi +3 -19
index e5e9e0c0589..a0710d56276 100644
@@ -13,11 +13,10 @@
 		led0 = &led0;
 		led1 = &led1;
 		led2 = &led2;
-		mmc0 = &usdhc3;
 		nand = &gpmi;
 		ssi0 = &ssi1;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -33,8 +32,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -137,8 +134,7 @@
 		regulator-name = "usb_h1_vbus";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-		gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
+		regulator-always-on;
 	};
 
 	reg_usb_otg_vbus: regulator-usb-otg-vbus {
@@ -189,8 +185,6 @@
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <300>;
 	status = "okay";
 };
 
@@ -545,14 +539,11 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
 &usbh1 {
 	vbus-supply = <&reg_usb_h1_vbus>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usbh1>;
 	status = "okay";
 };
 
@@ -602,7 +593,6 @@
 			MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0
 			MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0
 			MX6QDL_PAD_GPIO_16__ENET_REF_CLK	0x4001b0a8
-			MX6QDL_PAD_ENET_TXD0__GPIO1_IO30	0x1b0b0
 		>;
 	};
 
@@ -723,12 +713,6 @@
 		>;
 	};
 
-	pinctrl_usbh1: usbh1grp {
-		fsl,pins = <
-			MX6QDL_PAD_GPIO_9__GPIO1_IO09		0x1b0b0
-		>;
-	};
-
 	pinctrl_usbotg: usbotggrp {
 		fsl,pins = <
 			MX6QDL_PAD_GPIO_1__USB_OTG_ID		0x17059
arch/arm/dts/imx6qdl-gw54xx.dtsi +3 -19
index 2f41f092142..cda48bf2f16 100644
@@ -14,11 +14,10 @@
 		led0 = &led0;
 		led1 = &led1;
 		led2 = &led2;
-		mmc0 = &usdhc3;
 		nand = &gpmi;
 		ssi0 = &ssi1;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -34,8 +33,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -146,8 +143,7 @@
 			regulator-name = "usb_h1_vbus";
 			regulator-min-microvolt = <5000000>;
 			regulator-max-microvolt = <5000000>;
-			gpio = <&gpio1 16 GPIO_ACTIVE_HIGH>;
-			enable-active-high;
+			regulator-always-on;
 		};
 
 		reg_usb_otg_vbus: regulator@3 {
@@ -226,8 +222,6 @@
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <300>;
 	status = "okay";
 };
 
@@ -615,14 +609,11 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
 &usbh1 {
 	vbus-supply = <&reg_usb_h1_vbus>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usbh1>;
 	status = "okay";
 };
 
@@ -680,7 +671,6 @@
 			MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0
 			MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0
 			MX6QDL_PAD_GPIO_16__ENET_REF_CLK	0x4001b0a8
-			MX6QDL_PAD_ENET_TXD0__GPIO1_IO30	0x1b0b0
 		>;
 	};
 
@@ -818,12 +808,6 @@
 		>;
 	};
 
-	pinctrl_usbh1: usbh1grp {
-		fsl,pins = <
-			MX6QDL_PAD_SD1_DAT0__GPIO1_IO16		0x1b0b0
-		>;
-	};
-
 	pinctrl_usbotg: usbotggrp {
 		fsl,pins = <
 			MX6QDL_PAD_GPIO_1__USB_OTG_ID		0x17059
arch/arm/dts/imx6qdl-gw551x.dtsi +2 -5
index c0ffea16d81..435dec6338f 100644
@@ -57,8 +57,8 @@
 		led0 = &led0;
 		nand = &gpmi;
 		ssi0 = &ssi1;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -67,8 +67,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -536,7 +534,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw552x.dtsi +4 -25
index b853399aec6..2e61102ae69 100644
@@ -14,8 +14,8 @@
 		led1 = &led1;
 		led2 = &led2;
 		nand = &gpmi;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -24,8 +24,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -120,15 +118,7 @@
 		regulator-name = "5P0V";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-	};
-
-	reg_usb_h1_vbus: regulator-usbh1-vbus {
-		compatible = "regulator-fixed";
-		regulator-name = "usb_h1_vbus";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
+		regulator-always-on;
 	};
 };
 
@@ -399,13 +389,9 @@
 &uart5 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart5>;
-	status = "okay";
-};
+	status = "okay"; };
 
 &usbh1 {
-	vbus-supply = <&reg_usb_h1_vbus>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usbh1>;
 	status = "okay";
 };
 
@@ -414,7 +400,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
@@ -520,12 +505,6 @@
 		>;
 	};
 
-	pinctrl_usbh1: usbh1grp {
-		fsl,pins = <
-			MX6QDL_PAD_GPIO_9__GPIO1_IO09		0x1b0b0
-		>;
-	};
-
 	pinctrl_usbotg: usbotggrp {
 		fsl,pins = <
 			MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID	0x13059
arch/arm/dts/imx6qdl-gw553x.dtsi +2 -3
index b15c2818524..4662408b225 100644
@@ -55,8 +55,8 @@
 		led0 = &led0;
 		led1 = &led1;
 		nand = &gpmi;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -509,7 +509,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw560x.dtsi +3 -11
index 6586d877204..4bc4371e6ba 100644
@@ -55,11 +55,9 @@
 		led0 = &led0;
 		led1 = &led1;
 		led2 = &led2;
-		mmc0 = &usdhc2;
-		mmc1 = &usdhc3;
 		ssi0 = &ssi1;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -93,8 +91,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -221,8 +217,7 @@
 		regulator-name = "usb_h1_vbus";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-		gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
+		regulator-always-on;
 	};
 
 	reg_usb_otg_vbus: regulator-usb-otg-vbus {
@@ -280,8 +275,6 @@
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <300>;
 	status = "okay";
 };
 
@@ -661,7 +654,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw5903.dtsi +0 -6
index 1df3faba416..1fdb7ba630f 100644
@@ -75,8 +75,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -223,9 +221,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
-	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <300>;
 	status = "okay";
 };
 
@@ -534,7 +529,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "host";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw5904.dtsi +8 -19
index 381f605cc0d..612b6e068e2 100644
@@ -55,9 +55,8 @@
 		led0 = &led0;
 		led1 = &led1;
 		led2 = &led2;
-		mmc0 = &usdhc3;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -73,8 +72,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -176,8 +173,7 @@
 		regulator-name = "usb_h1_vbus";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-		gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
+		regulator-always-on;
 	};
 
 	reg_usb_otg_vbus: regulator-usb-otg-vbus {
@@ -201,9 +197,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
-	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <300>;
 	status = "okay";
 
 	fixed-link {
@@ -474,6 +467,11 @@
 		};
 	};
 
+	crypto@60 {
+		compatible = "atmel,atecc508a";
+		reg = <0x60>;
+	};
+
 	imu@6a {
 		compatible = "st,lsm9ds1-imu";
 		reg = <0x6a>;
@@ -588,14 +586,11 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
 &usbh1 {
 	vbus-supply = <&reg_usb_h1_vbus>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usbotg>;
 	status = "okay";
 };
 
@@ -756,12 +751,6 @@
 		>;
 	};
 
-	pinctrl_usbh1: usbh1grp {
-		fsl,pins = <
-			MX6QDL_PAD_GPIO_9__GPIO1_IO09		0x1b0b0
-		>;
-	};
-
 	pinctrl_usbotg: usbotggrp {
 		fsl,pins = <
 			MX6QDL_PAD_GPIO_1__USB_OTG_ID		0x17059
arch/arm/dts/imx6qdl-gw5907.dtsi +2 -7
index 68585f84d13..fcd3bdfd618 100644
@@ -13,8 +13,8 @@
 		led0 = &led0;
 		led1 = &led1;
 		nand = &gpmi;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -23,8 +23,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -131,8 +129,6 @@
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
 	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <300>;
 	status = "okay";
 };
 
@@ -380,7 +376,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "otg";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw5910.dtsi +0 -7
index 594468dcba8..68e5ab2e27e 100644
@@ -13,7 +13,6 @@
 		led0 = &led0;
 		led1 = &led1;
 		led2 = &led2;
-		mmc0 = &usdhc3;
 	};
 
 	chosen {
@@ -27,8 +26,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -146,9 +143,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
-	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <300>;
 	status = "okay";
 };
 
@@ -402,7 +396,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "host";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-gw5912.dtsi +3 -19
index f51ec3d62ce..0415bcb4164 100644
@@ -13,10 +13,9 @@
 		led0 = &led0;
 		led1 = &led1;
 		led2 = &led2;
-		mmc0 = &usdhc3;
 		nand = &gpmi;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -25,8 +24,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -120,8 +117,7 @@
 		regulator-name = "usb_vbus";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-		gpio = <&gpio4 5 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
+		regulator-always-on;
 	};
 };
 
@@ -142,9 +138,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
-	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <300>;
 	status = "okay";
 };
 
@@ -381,8 +374,6 @@
 
 &usbh1 {
 	vbus-supply = <&reg_usb_vbus>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usbh1>;
 	status = "okay";
 };
 
@@ -432,7 +423,6 @@
 			MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK	0x1b0b0
 			MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0
 			MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0
-			MX6QDL_PAD_ENET_TXD0__GPIO1_IO30	0x1b0b0
 		>;
 	};
 
@@ -563,12 +553,6 @@
 		>;
 	};
 
-	pinctrl_usbh1: usbh1grp {
-		fsl,pins = <
-			MX6QDL_PAD_GPIO_19__GPIO4_IO05		0x1b0b0
-		>;
-	};
-
 	pinctrl_usbotg: usbotggrp {
 		fsl,pins = <
 			MX6QDL_PAD_GPIO_1__USB_OTG_ID		0x13059
arch/arm/dts/imx6qdl-gw5913.dtsi +2 -8
index 44d347f04eb..8e23cec7149 100644
@@ -13,8 +13,8 @@
 		led0 = &led0;
 		led1 = &led1;
 		nand = &gpmi;
-		usb0 = &usbotg;
-		usb1 = &usbh1;
+		usb0 = &usbh1;
+		usb1 = &usbotg;
 	};
 
 	chosen {
@@ -23,8 +23,6 @@
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		user-pb {
 			label = "user_pb";
@@ -121,9 +119,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
 	phy-mode = "rgmii-id";
-	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
-	phy-reset-post-delay = <300>;
 	status = "okay";
 };
 
@@ -346,7 +341,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
-	dr_mode = "host";
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-hummingboard2.dtsi +1 -1
index e4231331f04..eb1ad28946d 100644
@@ -203,7 +203,7 @@
 &ecspi2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_hummingboard2_ecspi2>;
-	cs-gpios = <&gpio2 26 0>;
+	cs-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
 
arch/arm/dts/imx6qdl-icore.dtsi +17 -2
index 7814f1ef080..23c318d9636 100644
@@ -150,10 +150,23 @@
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
-	phy-reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
 	clocks = <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET>, <&rmii_clk>;
 	phy-mode = "rmii";
+	phy-handle = <&eth_phy>;
 	status = "okay";
+
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		eth_phy: ethernet-phy@0 {
+			compatible = "ethernet-phy-ieee802.3-c22";
+			reg = <0>;
+			reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
+			reset-assert-us = <4000>;
+			reset-deassert-us = <4000>;
+		};
+	};
 };
 
 &gpmi {
@@ -232,6 +245,7 @@
 };
 
 &pwm3 {
+	#pwm-cells = <2>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm3>;
 	status = "okay";
@@ -384,7 +398,7 @@
 
 	pinctrl_usbotg: usbotggrp {
 		fsl,pins = <
-			MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
+			MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
 		>;
 	};
 
@@ -396,6 +410,7 @@
 			MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17070
 			MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17070
 			MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17070
+			MX6QDL_PAD_GPIO_1__GPIO1_IO01  0x1b0b0
 		>;
 	};
 
arch/arm/dts/imx6qdl-mba6.dtsi +463 -135

396 lines not on this page · raw message

arch/arm/dts/imx6qdl-mba6a.dtsi +13 -22
index d8b4d00d853..df8fa169e9f 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-mba6b.dtsi +22 -18
index 7489b48d82d..7d1cd7454c7 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-nitrogen6x.dtsi +678 -55

733 lines not on this page · raw message

arch/arm/dts/imx6qdl-phytec-mira-peb-av-02.dtsi new file +119 -0

119 lines not on this page · raw message

arch/arm/dts/imx6qdl-phytec-mira-peb-eval-01.dtsi new file +71 -0

71 lines not on this page · raw message

arch/arm/dts/imx6qdl-phytec-mira-peb-wlbt-05.dtsi new file +85 -0

85 lines not on this page · raw message

arch/arm/dts/imx6qdl-phytec-mira.dtsi +27 -5
index 9ebd438dce7..120d6e997a4 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi +27 -3
index 77d871340eb..28a80538466 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-pico.dtsi +215 -11

226 lines not on this page · raw message

arch/arm/dts/imx6qdl-sabreauto.dtsi +86 -33

119 lines not on this page · raw message

arch/arm/dts/imx6qdl-sabrelite.dtsi +593 -235

828 lines not on this page · raw message

arch/arm/dts/imx6qdl-sabresd.dtsi +162 -52

214 lines not on this page · raw message

arch/arm/dts/imx6qdl-sr-som-ti.dtsi +1 -0
index 44a97ba93a9..352ac585ca6 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-sr-som.dtsi +22 -9
index c20bed27219..ce543e325cd 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-tqma6.dtsi +165 -161

326 lines not on this page · raw message

arch/arm/dts/imx6qdl-tqma6a.dtsi +36 -10

46 lines not on this page · raw message

arch/arm/dts/imx6qdl-tqma6b.dtsi +17 -11
index 682f5537012..dd092576644 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-udoo.dtsi +3 -1
index 2d0d102661b..93a8123da27 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-wandboard-revd1.dtsi +0 -2
index 93909796885..bf86b639fda 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6qdl-wandboard.dtsi +92 -10

102 lines not on this page · raw message

arch/arm/dts/imx6qdl.dtsi +122 -72

194 lines not on this page · raw message

include/dt-bindings/clock/imx6qdl-clock.h +9 -5
index 29050337d9d..e20c43cc36f 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.35.1

Part of the diff is not shown here. View the raw message.

#14 lore raw

PATCH 4/26 imx6dl/imx6qdl: synchronise device trees with linux

Quoted 3 lines

From: Marcel Ziswiler <[email protected]> Synchronise device trees with linux-next next-20220708.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#15 lore raw

PATCH 5/26 apalis_imx6: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux-next 20220706.

Please note that this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device tree we are now using the regular one for the Apalis Evaluation (carrier) board (e.g. imx6q-apalis-eval.dtb rather than the previous imx6-apalis.dtb).

---

 arch/arm/dts/Makefile                      |    4 +-
 arch/arm/dts/imx6-apalis-u-boot.dtsi       |   11 -
 arch/arm/dts/imx6-apalis.dts               |  752 -----------
 arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi |   25 +
 arch/arm/dts/imx6q-apalis-eval.dts         |  170 +++
 arch/arm/dts/imx6qdl-apalis.dtsi           | 1372 ++++++++++++++++++++
 board/toradex/apalis_imx6/MAINTAINERS      |    6 +-
 configs/apalis_imx6_defconfig              |    2 +-
 8 files changed, 1574 insertions(+), 768 deletions(-)
 delete mode 100644 arch/arm/dts/imx6-apalis-u-boot.dtsi
 delete mode 100644 arch/arm/dts/imx6-apalis.dts
 create mode 100644 arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6q-apalis-eval.dts
 create mode 100644 arch/arm/dts/imx6qdl-apalis.dtsi
arch/arm/dts/Makefile +2 -2
index 66c719908cd..d3fcb9336d0 100644
@@ -801,7 +801,7 @@ endif
 
 ifneq ($(CONFIG_MX6Q)$(CONFIG_MX6QDL),)
 dtb-y += \
-	imx6-apalis.dtb \
+	imx6q-apalis-eval.dtb \
 	imx6q-bosch-acc.dtb \
 	imx6q-cm-fx6.dtb \
 	imx6q-cubox-i.dtb \
@@ -893,7 +893,7 @@ dtb-$(CONFIG_MX6ULL) += \
 	imx6ulz-14x14-evk.dtb
 
 dtb-$(CONFIG_ARCH_MX6) += \
-	imx6-apalis.dtb \
+	imx6q-apalis-eval.dtb \
 	imx6-colibri.dtb
 
 dtb-$(CONFIG_O4_IMX_NANO) += \
arch/arm/dts/imx6-apalis-u-boot.dtsi deleted +0 -11
deleted file mode 100644
index 95e7e022b9a..00000000000
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
-/*
- * Copyright 2020 Foundries.IO
- */
-
-#include "imx6qdl-u-boot.dtsi"
-
-&wdog1 {
-	status = "okay";
-	u-boot,dm-spl;
-};
arch/arm/dts/imx6-apalis.dts deleted +0 -752

752 lines not on this page · raw message

arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi new file +25 -0
new file mode 100644
index 00000000000..df809565c63
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2022 Toradex
+ */
+
+#include "imx6qdl-u-boot.dtsi"
+
+&{/aliases} {
+	/* U-Boot won't find PMIC otherwise */
+	i2c0 = &i2c1;
+	i2c1 = &i2c2;
+	i2c2 = &i2c3;
+	/*
+	 * SDHCI instance order: eMMC, 8-bit SD/MMC, 4-bit SD
+	 * (U-Boot won't find ConfigBlock otherwise)
+	 */
+	mmc0 = &usdhc3;
+	mmc1 = &usdhc1;
+	mmc2 = &usdhc2;
+};
+
+&wdog1 {
+	status = "okay";
+	u-boot,dm-spl;
+};
arch/arm/dts/imx6q-apalis-eval.dts new file +170 -0

170 lines not on this page · raw message

arch/arm/dts/imx6qdl-apalis.dtsi new file +1372 -0

1,372 lines not on this page · raw message

board/toradex/apalis_imx6/MAINTAINERS +4 -2
index 2685457013e..9c36ae19a8d 100644
@@ -3,7 +3,9 @@ M:	Marcel Ziswiler <[email protected]>
 W:	http://developer.toradex.com/software/linux/linux-software
 W:      https://www.toradex.com/community
 S:	Maintained
+F:	arch/arm/dts/imx6q-apalis-eval.dts
+F:	arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi
+F:	arch/arm/dts/imx6qdl-apalis.dtsi
 F:	board/toradex/apalis_imx6/
-F:	include/configs/apalis_imx6.h
 F:	configs/apalis_imx6_defconfig
-F:	arch/arm/dts/imx6-apalis.dts
+F:	include/configs/apalis_imx6.h
configs/apalis_imx6_defconfig +1 -1
index f9721796dbf..2efbc98f926 100644
@@ -15,7 +15,7 @@ CONFIG_SYS_I2C_MXC_I2C1=y
 CONFIG_SYS_I2C_MXC_I2C2=y
 CONFIG_SYS_I2C_MXC_I2C3=y
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis"
+CONFIG_DEFAULT_DEVICE_TREE="imx6q-apalis-eval"
 CONFIG_SPL_TEXT_BASE=0x00908000
 CONFIG_SPL_MMC=y
 CONFIG_SPL_SERIAL=y
Signature · 1 line
2.35.1
#16 lore raw

PATCH 5/26 apalis_imx6: synchronise device tree with linux

Quoted 7 lines

From: Marcel Ziswiler <[email protected]> Synchronise device tree with linux-next 20220706.
Please note that this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device tree we are now using the regular one for the Apalis Evaluation (carrier) board (e.g. imx6q-apalis-eval.dtb rather than the previous imx6-apalis.dtb).

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#17 lore raw

PATCH 6/26 colibri_imx6: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux-next next-20220708.

Please note that this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device tree we are now using the regular one for the Colibri Evaluation (carrier) board V3 (e.g. imx6dl-colibri-eval-v3.dtb rather than the previous imx6-colibri.dtb).

---

 arch/arm/dts/Makefile                         |    2 +-
 arch/arm/dts/imx6-colibri.dts                 |  431 ------
 .../dts/imx6dl-colibri-eval-v3-u-boot.dtsi    |   20 +
 arch/arm/dts/imx6dl-colibri-eval-v3.dts       |  157 ++
 arch/arm/dts/imx6qdl-colibri.dtsi             | 1296 +++++++++++++++++
 board/toradex/colibri_imx6/MAINTAINERS        |    4 +-
 configs/colibri_imx6_defconfig                |    2 +-
 7 files changed, 1478 insertions(+), 434 deletions(-)
 delete mode 100644 arch/arm/dts/imx6-colibri.dts
 create mode 100644 arch/arm/dts/imx6dl-colibri-eval-v3-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6dl-colibri-eval-v3.dts
 create mode 100644 arch/arm/dts/imx6qdl-colibri.dtsi
arch/arm/dts/Makefile +1 -1
index d3fcb9336d0..fd18e57b945 100644
@@ -894,7 +894,7 @@ dtb-$(CONFIG_MX6ULL) += \
 
 dtb-$(CONFIG_ARCH_MX6) += \
 	imx6q-apalis-eval.dtb \
-	imx6-colibri.dtb
+	imx6dl-colibri-eval-v3.dtb
 
 dtb-$(CONFIG_O4_IMX_NANO) += \
 	o4-imx-nano.dtb
arch/arm/dts/imx6-colibri.dts deleted +0 -431

431 lines not on this page · raw message

arch/arm/dts/imx6dl-colibri-eval-v3-u-boot.dtsi new file +20 -0
new file mode 100644
index 00000000000..c4e8d0fb458
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2022 Toradex
+ */
+
+#include "imx6qdl-u-boot.dtsi"
+
+&{/aliases} {
+	/* U-Boot won't find PMIC otherwise */
+	i2c0 = &i2c3;
+	i2c1 = &i2c2;
+	/* SDHCI instance order: eMMC, 4-bit SD/MMC (U-Boot won't find ConfigBlock otherwise) */
+	mmc0 = &usdhc3;
+	mmc1 = &usdhc1;
+};
+
+&wdog1 {
+	status = "okay";
+	u-boot,dm-spl;
+};
arch/arm/dts/imx6dl-colibri-eval-v3.dts new file +157 -0

157 lines not on this page · raw message

arch/arm/dts/imx6qdl-colibri.dtsi new file +1296 -0

1,296 lines not on this page · raw message

board/toradex/colibri_imx6/MAINTAINERS +3 -1
index d2ed4147e94..f7a5ad59f86 100644
@@ -6,4 +6,6 @@ S:	Maintained
 F:	board/toradex/colibri_imx6/
 F:	include/configs/colibri_imx6.h
 F:	configs/colibri_imx6_defconfig
-F:	arch/arm/dts/imx6-colibri.dts
+F:	arch/arm/dts/imx6dl-colibri-eval-v3.dts
+F:	arch/arm/dts/imx6dl-colibri-eval-v3-u-boot.dtsi
+F:	arch/arm/dts/imx6qdl-colibri.dtsi
configs/colibri_imx6_defconfig +1 -1
index 0bdd088b1e7..fbaf11118a3 100644
@@ -15,7 +15,7 @@ CONFIG_SYS_I2C_MXC_I2C1=y
 CONFIG_SYS_I2C_MXC_I2C2=y
 CONFIG_SYS_I2C_MXC_I2C3=y
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6-colibri"
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-colibri-eval-v3"
 CONFIG_SPL_TEXT_BASE=0x00908000
 CONFIG_SPL_MMC=y
 CONFIG_SPL_SERIAL=y
Signature · 1 line
2.35.1
#18 lore raw

PATCH 6/26 colibri_imx6: synchronise device tree with linux

Quoted 7 lines

From: Marcel Ziswiler <[email protected]> Synchronise device tree with linux-next next-20220708. Please note that this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device tree we are now using the regular one for the Colibri Evaluation (carrier) board V3 (e.g. imx6dl-colibri-eval-v3.dtb rather than the previous imx6-colibri.dtb).

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#19 lore raw

PATCH 7/26 imx: mx6ul_14x14_evk: prepare to synchronise device trees with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

As a preparatory step remove the qspi node with its flash0 label as this is already in the Linux upstream device tree.

This avoids the following error once synchronised:

+arch/arm/dts/imx6ul-14x14-evk.dtb: ERROR (duplicate_label):
/soc/bus@2100000/spi@21e0000/n25q256a@0: Duplicate label 'flash0' on /soc/bus@2100000/spi@21e0000/n25q256a@0 and /soc/bus@2100000/spi@21e0000/flash@0

---

 arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi | 6 ------
 1 file changed, 6 deletions(-)
arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi +0 -6
index d0cbf79e33f..3bd6edb42e0 100644
@@ -8,12 +8,6 @@
 	display0 = &lcdif;
 };
 
-&qspi {
-	flash0: n25q256a@0 {
-		compatible = "jedec,spi-nor";
-	};
-};
-
 &{/soc} {
 	u-boot,dm-pre-reloc;
 };
Signature · 1 line
2.35.1
#20 lore raw

PATCH 7/26 imx: mx6ul_14x14_evk: prepare to synchronise device trees with linux

Quoted 9 lines

From: Marcel Ziswiler <[email protected]>
As a preparatory step remove the qspi node with its flash0 label as this is already in the Linux upstream device tree.
This avoids the following error once synchronised:
+arch/arm/dts/imx6ul-14x14-evk.dtb: ERROR (duplicate_label):
/soc/bus@2100000/spi@21e0000/n25q256a@0: Duplicate label 'flash0' on /soc/bus@2100000/spi@21e0000/n25q256a@0 and /soc/bus@2100000/spi@21e0000/flash@0

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#21 lore raw

PATCH 8/26 imx6ul/imx6ull: synchronise device trees with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device trees with linux v5.19-rc5.

---

 arch/arm/dts/imx6ul-14x14-evk.dtsi            | 161 +++++++-
 arch/arm/dts/imx6ul-geam.dts                  | 363 ++++++++++++++--
 arch/arm/dts/imx6ul-imx6ull-opos6ul.dtsi      | 148 +++++++
 arch/arm/dts/imx6ul-imx6ull-opos6uldev.dtsi   | 327 +++++++++++++++
 arch/arm/dts/imx6ul-isiot-emmc.dts            |  42 +-
 arch/arm/dts/imx6ul-isiot-nand.dts            |  45 +-
 arch/arm/dts/imx6ul-isiot.dtsi                | 330 ++++++++++++---
 arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi      |  20 +-
 .../dts/imx6ul-kontron-n6x1x-som-common.dtsi  |  30 +-
 arch/arm/dts/imx6ul-litesom.dtsi              |   1 +
 arch/arm/dts/imx6ul-opos6ul.dtsi              | 194 +--------
 arch/arm/dts/imx6ul-opos6uldev.dts            | 387 +-----------------
 arch/arm/dts/imx6ul-phytec-phycore-som.dtsi   |  21 +-
 .../dts/imx6ul-phytec-segin-ff-rdk-nand.dts   |   2 +
 .../dts/imx6ul-phytec-segin-peb-av-02.dtsi    | 150 +++++++
 .../dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi  |  90 ++++
 arch/arm/dts/imx6ul-phytec-segin.dtsi         |  46 +--
 arch/arm/dts/imx6ul-pico-hobbit.dts           |   2 +-
 arch/arm/dts/imx6ul-pico-pi.dts               |   4 +-
 arch/arm/dts/imx6ul-pico.dtsi                 |  40 +-
 arch/arm/dts/imx6ul.dtsi                      | 186 ++++++---
 arch/arm/dts/imx6ull-myir-mys-6ulx-eval.dts   |   2 +-
 .../dts/imx6ull-phytec-segin-ff-rdk-emmc.dts  |   1 +
 .../dts/imx6ull-phytec-segin-peb-av-02.dtsi   |  26 ++
 arch/arm/dts/imx6ull-phytec-segin.dtsi        |   7 -
 arch/arm/dts/imx6ull.dtsi                     |  14 +
 26 files changed, 1695 insertions(+), 944 deletions(-)
 create mode 100644 arch/arm/dts/imx6ul-imx6ull-opos6ul.dtsi
 create mode 100644 arch/arm/dts/imx6ul-imx6ull-opos6uldev.dtsi
 create mode 100644 arch/arm/dts/imx6ul-phytec-segin-peb-av-02.dtsi
 create mode 100644 arch/arm/dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi
 create mode 100644 arch/arm/dts/imx6ull-phytec-segin-peb-av-02.dtsi
arch/arm/dts/imx6ul-14x14-evk.dtsi +139 -22
index 463d7ca124b..1a18c41ce38 100644
@@ -3,10 +3,6 @@
 // Copyright (C) 2015 Freescale Semiconductor, Inc.
 
 / {
-	aliases {
-		spi5 = &{/spi4};
-	};
-
 	chosen {
 		stdout-path = &uart1;
 	};
@@ -34,6 +30,28 @@
 		enable-active-high;
 	};
 
+	reg_peri_3v3: regulator-peri-3v3 {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_peri_3v3>;
+		regulator-name = "VPERI_3V3";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		gpio = <&gpio5 2 GPIO_ACTIVE_LOW>;
+		/*
+		 * If you want to want to make this dynamic please
+		 * check schematics and test all affected peripherals:
+		 *
+		 * - sensors
+		 * - ethernet phy
+		 * - can
+		 * - bluetooth
+		 * - wm8960 audio codec
+		 * - ov5640 camera
+		 */
+		regulator-always-on;
+	};
+
 	reg_can_3v3: regulator-can-3v3 {
 		compatible = "regulator-fixed";
 		regulator-name = "can-3v3";
@@ -42,6 +60,28 @@
 		gpios = <&gpio_spi 3 GPIO_ACTIVE_LOW>;
 	};
 
+	sound-wm8960 {
+		compatible = "fsl,imx-audio-wm8960";
+		model = "wm8960-audio";
+		audio-cpu = <&sai2>;
+		audio-codec = <&codec>;
+		audio-asrc = <&asrc>;
+		hp-det-gpio = <&gpio5 4 0>;
+		audio-routing =
+			"Headphone Jack", "HP_L",
+			"Headphone Jack", "HP_R",
+			"Ext Spk", "SPK_LP",
+			"Ext Spk", "SPK_LN",
+			"Ext Spk", "SPK_RP",
+			"Ext Spk", "SPK_RN",
+			"LINPUT2", "Mic Jack",
+			"LINPUT3", "Mic Jack",
+			"RINPUT1", "AMIC",
+			"RINPUT2", "AMIC",
+			"Mic Jack", "MICB",
+			"AMIC", "MICB";
+	};
+
 	spi4 {
 		compatible = "spi-gpio";
 		pinctrl-names = "default";
@@ -49,7 +89,7 @@
 		status = "okay";
 		gpio-sck = <&gpio5 11 0>;
 		gpio-mosi = <&gpio5 10 0>;
-		cs-gpios = <&gpio5 7 0>;
+		cs-gpios = <&gpio5 7 GPIO_ACTIVE_LOW>;
 		num-chipselects = <1>;
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -61,6 +101,7 @@
 			reg = <0>;
 			registers-number = <1>;
 			spi-max-frequency = <100000>;
+			enable-gpios = <&gpio5 8 GPIO_ACTIVE_LOW>;
 		};
 	};
 
@@ -82,7 +123,7 @@
 };
 
 &i2c2 {
-	clock_frequency = <100000>;
+	clock-frequency = <100000>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c2>;
 	status = "okay";
@@ -92,6 +133,45 @@
 		compatible = "wlf,wm8960";
 		reg = <0x1a>;
 		wlf,shared-lrclk;
+		wlf,hp-cfg = <3 2 3>;
+		wlf,gpio-cfg = <1 3>;
+		clocks = <&clks IMX6UL_CLK_SAI2>;
+		clock-names = "mclk";
+	};
+
+	camera@3c {
+		compatible = "ovti,ov5640";
+		reg = <0x3c>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_camera_clock>;
+		clocks = <&clks IMX6UL_CLK_CSI>;
+		clock-names = "xclk";
+		powerdown-gpios = <&gpio_spi 6 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&gpio_spi 5 GPIO_ACTIVE_LOW>;
+
+		port {
+			ov5640_to_parallel: endpoint {
+				remote-endpoint = <&parallel_from_ov5640>;
+				bus-width = <8>;
+				data-shift = <2>; /* lines 9:2 are used */
+				hsync-active = <0>;
+				vsync-active = <0>;
+				pclk-sample = <1>;
+			};
+		};
+	};
+};
+
+&csi {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_csi1>;
+	status = "okay";
+
+	port {
+		parallel_from_ov5640: endpoint {
+			remote-endpoint = <&ov5640_to_parallel>;
+			bus-type = <5>; /* Parallel bus */
+		};
 	};
 };
 
@@ -100,6 +180,7 @@
 	pinctrl-0 = <&pinctrl_enet1>;
 	phy-mode = "rmii";
 	phy-handle = <&ethphy0>;
+	phy-supply = <&reg_peri_3v3>;
 	status = "okay";
 };
 
@@ -108,6 +189,7 @@
 	pinctrl-0 = <&pinctrl_enet2>;
 	phy-mode = "rmii";
 	phy-handle = <&ethphy1>;
+	phy-supply = <&reg_peri_3v3>;
 	status = "okay";
 
 	mdio {
@@ -115,13 +197,16 @@
 		#size-cells = <0>;
 
 		ethphy0: ethernet-phy@2 {
+			compatible = "ethernet-phy-id0022.1560";
 			reg = <2>;
 			micrel,led-mode = <1>;
 			clocks = <&clks IMX6UL_CLK_ENET_REF>;
 			clock-names = "rmii-ref";
+
 		};
 
 		ethphy1: ethernet-phy@1 {
+			compatible = "ethernet-phy-id0022.1560";
 			reg = <1>;
 			micrel,led-mode = <1>;
 			clocks = <&clks IMX6UL_CLK_ENET2_REF>;
@@ -144,18 +229,33 @@
 	status = "okay";
 };
 
+&gpio_spi {
+	eth0-phy-hog {
+		gpio-hog;
+		gpios = <1 GPIO_ACTIVE_HIGH>;
+		output-high;
+		line-name = "eth0-phy";
+	};
+
+	eth1-phy-hog {
+		gpio-hog;
+		gpios = <2 GPIO_ACTIVE_HIGH>;
+		output-high;
+		line-name = "eth1-phy";
+	};
+};
+
 &i2c1 {
 	clock-frequency = <100000>;
-	pinctrl-names = "default", "gpio";
+	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c1>;
-	pinctrl-1 = <&pinctrl_i2c1_gpio>;
-	scl-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
-	sda-gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
 	status = "okay";
 
-	mag3110@e {
+	magnetometer@e {
 		compatible = "fsl,mag3110";
 		reg = <0x0e>;
+		vdd-supply = <&reg_peri_3v3>;
+		vddio-supply = <&reg_peri_3v3>;
 	};
 };
 
@@ -175,6 +275,7 @@
 };
 
 &pwm1 {
+	#pwm-cells = <2>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm1>;
 	status = "okay";
@@ -185,13 +286,13 @@
 	pinctrl-0 = <&pinctrl_qspi>;
 	status = "okay";
 
-	flash0: n25q256a@0 {
+	flash0: flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "micron,n25q256a";
+		compatible = "micron,n25q256a", "jedec,spi-nor";
 		spi-max-frequency = <29000000>;
 		spi-rx-bus-width = <4>;
-		spi-tx-bus-width = <4>;
+		spi-tx-bus-width = <1>;
 		reg = <0>;
 	};
 };
@@ -211,6 +312,10 @@
 	status = "okay";
 };
 
+&snvs_pwrkey {
+	status = "okay";
+};
+
 &tsc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_tsc>;
@@ -235,6 +340,8 @@
 
 &usbotg1 {
 	dr_mode = "otg";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usb_otg1>;
 	status = "okay";
 };
 
@@ -283,9 +390,14 @@
 &iomuxc {
 	pinctrl-names = "default";
 
-	pinctrl_csi1: csi1grp {
+	pinctrl_camera_clock: cameraclockgrp {
 		fsl,pins = <
 			MX6UL_PAD_CSI_MCLK__CSI_MCLK		0x1b088
+		>;
+	};
+
+	pinctrl_csi1: csi1grp {
+		fsl,pins = <
 			MX6UL_PAD_CSI_PIXCLK__CSI_PIXCLK	0x1b088
 			MX6UL_PAD_CSI_VSYNC__CSI_VSYNC		0x1b088
 			MX6UL_PAD_CSI_HSYNC__CSI_HSYNC		0x1b088
@@ -349,13 +461,6 @@
 		>;
 	};
 
-	pinctrl_i2c1_gpio: i2c1grp_gpio {
-		fsl,pins = <
-			MX6UL_PAD_UART4_TX_DATA__GPIO1_IO28 0x1b8b0
-			MX6UL_PAD_UART4_RX_DATA__GPIO1_IO29 0x1b8b0
-		>;
-	};
-
 	pinctrl_i2c2: i2c2grp {
 		fsl,pins = <
 			MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
@@ -425,6 +530,12 @@
 		>;
 	};
 
+	pinctrl_peri_3v3: peri3v3grp {
+		fsl,pins = <
+			MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02	0x1b0b0
+		>;
+	};
+
 	pinctrl_pwm1: pwm1grp {
 		fsl,pins = <
 			MX6UL_PAD_GPIO1_IO08__PWM1_OUT   0x110b0
@@ -476,6 +587,12 @@
 		>;
 	};
 
+	pinctrl_usb_otg1: usbotg1grp {
+		fsl,pins = <
+			MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID	0x17059
+		>;
+	};
+
 	pinctrl_usdhc1: usdhc1grp {
 		fsl,pins = <
 			MX6UL_PAD_SD1_CMD__USDHC1_CMD     	0x17059
arch/arm/dts/imx6ul-geam.dts +321 -42

437 lines not on this page · raw message

arch/arm/dts/imx6ul-imx6ull-opos6ul.dtsi new file +148 -0

148 lines not on this page · raw message

arch/arm/dts/imx6ul-imx6ull-opos6uldev.dtsi new file +327 -0

327 lines not on this page · raw message

arch/arm/dts/imx6ul-isiot-emmc.dts +2 -40

58 lines not on this page · raw message

arch/arm/dts/imx6ul-isiot-nand.dts +6 -39

57 lines not on this page · raw message

arch/arm/dts/imx6ul-isiot.dtsi +276 -54

395 lines not on this page · raw message

arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi +3 -17
index 4682a79f5b2..a6cf0f21c66 100644
@@ -84,7 +84,7 @@
 };
 
 &ecspi1 {
-	cs-gpios = <&gpio4 26 GPIO_ACTIVE_HIGH>;
+	cs-gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_ecspi1>;
 	status = "okay";
@@ -153,6 +153,7 @@
 };
 
 &pwm8 {
+	#pwm-cells = <2>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm8>;
 	status = "okay";
@@ -177,7 +178,7 @@
 &uart3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart3>;
-	fsl,uart-has-rtscts;
+	uart-has-rtscts;
 	status = "okay";
 };
 
@@ -214,7 +215,6 @@
 	wakeup-source;
 	vmmc-supply = <&reg_3v3>;
 	voltage-ranges = <3300 3300>;
-	bus-width = <4>;
 	no-1-8-v;
 	status = "okay";
 };
@@ -229,18 +229,10 @@
 	wakeup-source;
 	vmmc-supply = <&reg_3v3>;
 	voltage-ranges = <3300 3300>;
-	bus-width = <4>;
 	no-1-8-v;
 	status = "okay";
 };
 
-&wdog1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_wdog>;
-	fsl,ext-reset-output;
-	status = "okay";
-};
-
 &iomuxc {
 	pinctrl-0 = <&pinctrl_reset_out &pinctrl_gpio>;
 
@@ -411,10 +403,4 @@
 			MX6UL_PAD_NAND_DATA03__USDHC2_DATA3	0x170f9
 		>;
 	};
-
-	pinctrl_wdog: wdoggrp {
-		fsl,pins = <
-			MX6UL_PAD_GPIO1_IO09__WDOG1_WDOG_ANY	0x30b0
-		>;
-	};
 };
arch/arm/dts/imx6ul-kontron-n6x1x-som-common.dtsi +14 -16
index e9ec6b78919..09a83dbdf65 100644
@@ -11,20 +11,15 @@
 	chosen {
 		stdout-path = &uart4;
 	};
-
-	memory@80000000 {
-		reg = <0x80000000 0x10000000>;
-		device_type = "memory";
-	};
 };
 
 &ecspi2 {
-	cs-gpios = <&gpio4 22 GPIO_ACTIVE_HIGH>;
+	cs-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_ecspi2>;
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		compatible = "mxicy,mx25v8035f", "jedec,spi-nor";
 		spi-max-frequency = <50000000>;
 		reg = <0>;
@@ -60,16 +55,13 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_qspi>;
 	status = "okay";
+};
 
-	spi-flash@0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "spi-nand";
-		spi-max-frequency = <104000000>;
-		spi-tx-bus-width = <4>;
-		spi-rx-bus-width = <4>;
-		reg = <0>;
-	};
+&wdog1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_wdog>;
+	fsl,ext-reset-output;
+	status = "okay";
 };
 
 &iomuxc {
@@ -121,4 +113,10 @@
 			MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09      0x1b0b0
 		>;
 	};
+
+	pinctrl_wdog: wdoggrp {
+		fsl,pins = <
+			MX6UL_PAD_GPIO1_IO09__WDOG1_WDOG_ANY    0x18b0
+		>;
+	};
 };
arch/arm/dts/imx6ul-litesom.dtsi +1 -0
index 8f775f6974d..8d689321084 100644
@@ -48,6 +48,7 @@
 	compatible = "grinn,imx6ul-litesom", "fsl,imx6ul";
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
 };
arch/arm/dts/imx6ul-opos6ul.dtsi +4 -190

196 lines not on this page · raw message

arch/arm/dts/imx6ul-opos6uldev.dts +8 -379

406 lines not on this page · raw message

arch/arm/dts/imx6ul-phytec-phycore-som.dtsi +18 -3
index c2a7c787794..3cddc68917a 100644
@@ -16,9 +16,13 @@
 		stdout-path = &uart1;
 	};
 
-	memory {
+	/*
+	 * Set the minimum memory size here and
+	 * let the bootloader set the real size.
+	 */
+	memory@80000000 {
 		device_type = "memory";
-		reg = <0x80000000 0x20000000>;
+		reg = <0x80000000 0x8000000>;
 	};
 
 	gpio_leds_som: leds {
@@ -64,13 +68,17 @@
 };
 
 &i2c1 {
-	pinctrl-names = "default";
+	pinctrl-names = "default", "gpio";
 	pinctrl-0 = <&pinctrl_i2c1>;
+	pinctrl-1 = <&pinctrl_i2c1_gpio>;
+	scl-gpios = <&gpio1 28 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+	sda-gpios = <&gpio1 29 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 	clock-frequency = <100000>;
 	status = "okay";
 
 	eeprom@52 {
 		compatible = "catalyst,24c32", "atmel,24c32";
+		pagesize = <32>;
 		reg = <0x52>;
 	};
 };
@@ -142,6 +150,13 @@
 		>;
 	};
 
+	pinctrl_i2c1_gpio: i2cgpiogrp {
+		fsl,pins = <
+			MX6UL_PAD_UART4_TX_DATA__GPIO1_IO28	0x4001b8b0
+			MX6UL_PAD_UART4_RX_DATA__GPIO1_IO29	0x4001b8b0
+		>;
+	};
+
 	pinctrl_uart1: uart1grp {
 		fsl,pins = <
 			MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX	0x1b0b1
arch/arm/dts/imx6ul-phytec-segin-ff-rdk-nand.dts +2 -0
index 699dfcbf9a6..607eddc5030 100644
@@ -9,6 +9,8 @@
 #include "imx6ul-phytec-phycore-som.dtsi"
 #include "imx6ul-phytec-segin.dtsi"
 #include "imx6ul-phytec-segin-peb-eval-01.dtsi"
+#include "imx6ul-phytec-segin-peb-av-02.dtsi"
+#include "imx6ul-phytec-segin-peb-wlbt-05.dtsi"
 
 / {
 	model = "PHYTEC phyBOARD-Segin i.MX6 UltraLite Full Featured with NAND";
arch/arm/dts/imx6ul-phytec-segin-peb-av-02.dtsi new file +150 -0

150 lines not on this page · raw message

arch/arm/dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi new file +90 -0

90 lines not on this page · raw message

arch/arm/dts/imx6ul-phytec-segin.dtsi +2 -44

82 lines not on this page · raw message

arch/arm/dts/imx6ul-pico-hobbit.dts +1 -1
index 39eeeddac39..09f7ffa9ad8 100644
@@ -43,7 +43,7 @@
 };
 
 &i2c2 {
-	clock_frequency = <100000>;
+	clock-frequency = <100000>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c2>;
 	status = "okay";
arch/arm/dts/imx6ul-pico-pi.dts +2 -2
index de07357b27f..6cd7d5877d2 100644
@@ -43,7 +43,7 @@
 };
 
 &i2c2 {
-	clock_frequency = <100000>;
+	clock-frequency = <100000>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c2>;
 	status = "okay";
@@ -58,7 +58,7 @@
 };
 
 &i2c3 {
-	clock_frequency = <100000>;
+	clock-frequency = <100000>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c3>;
 	status = "okay";
arch/arm/dts/imx6ul-pico.dtsi +16 -24
index de9f83189ba..357ffb2f5ad 100644
@@ -20,7 +20,7 @@
 		stdout-path = &uart6;
 	};
 
-	backlight {
+	backlight: backlight {
 		compatible = "pwm-backlight";
 		pwms = <&pwm3 0 5000000>;
 		brightness-levels = <0 4 8 16 32 64 128 255>;
@@ -72,6 +72,17 @@
 		regulator-max-microvolt = <3300000>;
 		startup-delay-us = <200000>;
 	};
+
+	panel {
+		compatible = "vxt,vl050-8048nt-c01";
+		backlight = <&backlight>;
+
+		port {
+			panel_in: endpoint {
+				remote-endpoint = <&display_out>;
+			};
+		};
+	};
 };
 
 &can1 {
@@ -154,36 +165,17 @@
 &lcdif {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>;
-	display = <&display0>;
 	status = "okay";
 
-	display0: display0 {
-		bits-per-pixel = <32>;
-		bus-width = <24>;
-
-		display-timings {
-			native-mode = <&timing0>;
-
-			timing0: timing0 {
-				clock-frequency = <33200000>;
-				hactive = <800>;
-				vactive = <480>;
-				hfront-porch = <210>;
-				hback-porch = <46>;
-				hsync-len = <1>;
-				vback-porch = <22>;
-				vfront-porch = <23>;
-				vsync-len = <1>;
-				hsync-active = <0>;
-				vsync-active = <0>;
-				de-active = <1>;
-				pixelclk-active = <0>;
-			};
+	port {
+		display_out: endpoint {
+			remote-endpoint = <&panel_in>;
 		};
 	};
 };
 
 &pwm3 {
+	#pwm-cells = <2>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm3>;
 	status = "okay";
arch/arm/dts/imx6ul.dtsi +123 -63

97 lines not on this page · raw message

arch/arm/dts/imx6ull-myir-mys-6ulx-eval.dts +1 -1
index 2fd69da0284..79cc45728cd 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts +1 -0
index 9648d4ecaf5..8e2a4c5d776 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ull-phytec-segin-peb-av-02.dtsi new file +26 -0
new file mode 100644
index 00000000000..06bb7f32778

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ull-phytec-segin.dtsi +0 -7
index c1595fc785f..e287a0453b5 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/imx6ull.dtsi +14 -0
index f224e20bda9..9bf67490ac4 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.35.1

Part of the diff is not shown here. View the raw message.

#22 lore raw

PATCH 8/26 imx6ul/imx6ull: synchronise device trees with linux

Quoted 3 lines

From: Marcel Ziswiler <[email protected]> Synchronise device trees with linux v5.19-rc5.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#23 lore raw

Re: [PATCH v1 08/26] imx6ul/imx6ull: synchronise device trees with linux

In reply to Marcel Ziswiler

Hi Marcel,

Am 21.07.22 um 15:27 schrieb Marcel Ziswiler:

Quoted 5 lines

From: Marcel Ziswiler <[email protected]>

Synchronise device trees with linux v5.19-rc5.

Thanks for the sync patches!

Unfortunately this will break the Kontron SL/BL i.MX6UL/ULL boards (N6x1x). The reason is that the U-Boot devicetrees received some simplification and renaming that haven't been upstreamed to the kernel, yet. I will add updating the kernel DTs to my to-do list and would recommend to drop the Kontron DT changes from this patch for now.

Thanks
Frieder

Quoted 34 lines

---

 arch/arm/dts/imx6ul-14x14-evk.dtsi            | 161 +++++++-
 arch/arm/dts/imx6ul-geam.dts                  | 363 ++++++++++++++--
 arch/arm/dts/imx6ul-imx6ull-opos6ul.dtsi      | 148 +++++++
 arch/arm/dts/imx6ul-imx6ull-opos6uldev.dtsi   | 327 +++++++++++++++
 arch/arm/dts/imx6ul-isiot-emmc.dts            |  42 +-
 arch/arm/dts/imx6ul-isiot-nand.dts            |  45 +-
 arch/arm/dts/imx6ul-isiot.dtsi                | 330 ++++++++++++---
 arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi      |  20 +-
 .../dts/imx6ul-kontron-n6x1x-som-common.dtsi  |  30 +-
 arch/arm/dts/imx6ul-litesom.dtsi              |   1 +
 arch/arm/dts/imx6ul-opos6ul.dtsi              | 194 +--------
 arch/arm/dts/imx6ul-opos6uldev.dts            | 387 +-----------------
 arch/arm/dts/imx6ul-phytec-phycore-som.dtsi   |  21 +-
 .../dts/imx6ul-phytec-segin-ff-rdk-nand.dts   |   2 +
 .../dts/imx6ul-phytec-segin-peb-av-02.dtsi    | 150 +++++++
 .../dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi  |  90 ++++
 arch/arm/dts/imx6ul-phytec-segin.dtsi         |  46 +--
 arch/arm/dts/imx6ul-pico-hobbit.dts           |   2 +-
 arch/arm/dts/imx6ul-pico-pi.dts               |   4 +-
 arch/arm/dts/imx6ul-pico.dtsi                 |  40 +-
 arch/arm/dts/imx6ul.dtsi                      | 186 ++++++---
 arch/arm/dts/imx6ull-myir-mys-6ulx-eval.dts   |   2 +-
 .../dts/imx6ull-phytec-segin-ff-rdk-emmc.dts  |   1 +
 .../dts/imx6ull-phytec-segin-peb-av-02.dtsi   |  26 ++
 arch/arm/dts/imx6ull-phytec-segin.dtsi        |   7 -
 arch/arm/dts/imx6ull.dtsi                     |  14 +
 26 files changed, 1695 insertions(+), 944 deletions(-)
 create mode 100644 arch/arm/dts/imx6ul-imx6ull-opos6ul.dtsi
 create mode 100644 arch/arm/dts/imx6ul-imx6ull-opos6uldev.dtsi
 create mode 100644 arch/arm/dts/imx6ul-phytec-segin-peb-av-02.dtsi
 create mode 100644 arch/arm/dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi
 create mode 100644 arch/arm/dts/imx6ull-phytec-segin-peb-av-02.dtsi
#24 lore raw

Re: [PATCH v1 08/26] imx6ul/imx6ull: synchronise device trees with linux

Hi Frieder,

Quoted 9 lines · Frieder Schrempf

Hi Marcel,

Am 21.07.22 um 15:27 schrieb Marcel Ziswiler:

Quoted 5 lines

From: Marcel Ziswiler <[email protected]>

Synchronise device trees with linux v5.19-rc5.

Quoted 8 lines

Thanks for the sync patches!

Unfortunately this will break the Kontron SL/BL i.MX6UL/ULL boards (N6x1x). The reason is that the U-Boot devicetrees received some simplification and renaming that haven't been upstreamed to the kernel, yet. I will add updating the kernel DTs to my to-do list and would recommend to drop the Kontron DT changes from this patch for now.

Can be an option that you will post patches here when you send for inclusion in the kernel ? Marcel's patch are currently just on TOT, and yes, I can revert for Kontron's board if Tom is close to release 2022.10. But we have still some time...

Regards,
Stefano

Quoted 37 lines

Thanks
Frieder

Quoted 34 lines

---

  arch/arm/dts/imx6ul-14x14-evk.dtsi            | 161 +++++++-
  arch/arm/dts/imx6ul-geam.dts                  | 363 ++++++++++++++--
  arch/arm/dts/imx6ul-imx6ull-opos6ul.dtsi      | 148 +++++++
  arch/arm/dts/imx6ul-imx6ull-opos6uldev.dtsi   | 327 +++++++++++++++
  arch/arm/dts/imx6ul-isiot-emmc.dts            |  42 +-
  arch/arm/dts/imx6ul-isiot-nand.dts            |  45 +-
  arch/arm/dts/imx6ul-isiot.dtsi                | 330 ++++++++++++---
  arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi      |  20 +-
  .../dts/imx6ul-kontron-n6x1x-som-common.dtsi  |  30 +-
  arch/arm/dts/imx6ul-litesom.dtsi              |   1 +
  arch/arm/dts/imx6ul-opos6ul.dtsi              | 194 +--------
  arch/arm/dts/imx6ul-opos6uldev.dts            | 387 +-----------------
  arch/arm/dts/imx6ul-phytec-phycore-som.dtsi   |  21 +-
  .../dts/imx6ul-phytec-segin-ff-rdk-nand.dts   |   2 +
  .../dts/imx6ul-phytec-segin-peb-av-02.dtsi    | 150 +++++++
  .../dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi  |  90 ++++
  arch/arm/dts/imx6ul-phytec-segin.dtsi         |  46 +--
  arch/arm/dts/imx6ul-pico-hobbit.dts           |   2 +-
  arch/arm/dts/imx6ul-pico-pi.dts               |   4 +-
  arch/arm/dts/imx6ul-pico.dtsi                 |  40 +-
  arch/arm/dts/imx6ul.dtsi                      | 186 ++++++---
  arch/arm/dts/imx6ull-myir-mys-6ulx-eval.dts   |   2 +-
  .../dts/imx6ull-phytec-segin-ff-rdk-emmc.dts  |   1 +
  .../dts/imx6ull-phytec-segin-peb-av-02.dtsi   |  26 ++
  arch/arm/dts/imx6ull-phytec-segin.dtsi        |   7 -
  arch/arm/dts/imx6ull.dtsi                     |  14 +
  26 files changed, 1695 insertions(+), 944 deletions(-)

create mode 100644 arch/arm/dts/imx6ul-imx6ull-opos6ul.dtsi create mode 100644 arch/arm/dts/imx6ul-imx6ull-opos6uldev.dtsi create mode 100644 arch/arm/dts/imx6ul-phytec-segin-peb-av-02.dtsi create mode 100644 arch/arm/dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi create mode 100644 arch/arm/dts/imx6ull-phytec-segin-peb-av-02.dtsi

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#25 lore raw

Re: [PATCH v1 08/26] imx6ul/imx6ull: synchronise device trees with linux

In reply to Frieder Schrempf

Hi Frieder

Quoted 9 lines · Frieder Schrempf

Hi Marcel,

Am 21.07.22 um 15:27 schrieb Marcel Ziswiler:

Quoted 5 lines

From: Marcel Ziswiler <[email protected]>

Synchronise device trees with linux v5.19-rc5.

Quoted 7 lines

Thanks for the sync patches!

Unfortunately this will break the Kontron SL/BL i.MX6UL/ULL boards (N6x1x). The reason is that the U-Boot devicetrees received some simplification and renaming that haven't been upstreamed to the kernel, yet. I will add updating the kernel DTs to my to-do list and would recommend to drop the Kontron DT changes from this patch for now.

Sorry about that. I did not expect Stefano to apply all of this that quickly. On the other hand we can be very grateful that he reacted that promptly this time around (;-p).

Anyway, please let me know if I can be of service to correct any of this. Like I wrote in [1] I plan to re-sync again and fix a few review comments once 6.0-rc1 is out. I guess I could also include a fix (or revert) by that time.

[1] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/#2943543

Quoted 2 lines

Thanks
Frieder

Cheers

Marcel

#26 lore raw

Re: [PATCH v1 08/26] imx6ul/imx6ull: synchronise device trees with linux

Quoted 14 lines · Marcel Ziswiler

Hi Frieder

Quoted 11 lines · Frieder Schrempf

Hi Marcel,

Am 21.07.22 um 15:27 schrieb Marcel Ziswiler:

Quoted 5 lines

From: Marcel Ziswiler <[email protected]>

Synchronise device trees with linux v5.19-rc5.

Thanks for the sync patches!

Quoted 9 lines
Quoted 5 lines

Unfortunately this will break the Kontron SL/BL i.MX6UL/ULL boards (N6x1x). The reason is that the U-Boot devicetrees received some simplification and renaming that haven't been upstreamed to the kernel, yet. I will add updating the kernel DTs to my to-do list and would recommend to drop the Kontron DT changes from this patch for now.

Sorry about that. I did not expect Stefano to apply all of this that quickly. On the other hand we can be very grateful that he reacted that promptly this time around (;-p).

:-D

Quoted 3 lines

Anyway, please let me know if I can be of service to correct any of this. Like I wrote in [1] I plan to re-sync again and fix a few review comments once 6.0-rc1 is out. I guess I could also include a fix (or revert) by that time.

I think it is a good plan.

Stefano

Quoted 9 lines

[1] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/#2943543

Quoted 2 lines

Thanks
Frieder

Cheers

Marcel

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#27 lore raw

Re: [PATCH v1 08/26] imx6ul/imx6ull: synchronise device trees with linux

Hi Marcel, hi Stefano,

Am 03.08.22 um 15:02 schrieb Stefano Babic:

Quoted 28 lines · Marcel Ziswiler
Quoted 20 lines

Hi Frieder

Quoted 9 lines · Frieder Schrempf

Hi Marcel,

Am 21.07.22 um 15:27 schrieb Marcel Ziswiler:

Quoted 5 lines

From: Marcel Ziswiler <[email protected]>

Synchronise device trees with linux v5.19-rc5.

Quoted 7 lines

Thanks for the sync patches!

Unfortunately this will break the Kontron SL/BL i.MX6UL/ULL boards (N6x1x). The reason is that the U-Boot devicetrees received some simplification and renaming that haven't been upstreamed to the kernel, yet. I will add updating the kernel DTs to my to-do list and would recommend to drop the Kontron DT changes from this patch for now.

Quoted 4 lines

Sorry about that. I did not expect Stefano to apply all of this that quickly. On the other hand we can be very
grateful that he reacted that promptly this time around (;-p).

:-D

Quoted 7 lines
Quoted 5 lines

Anyway, please let me know if I can be of service to correct any of this. Like I wrote in [1] I plan to re-sync
again and fix a few review comments once 6.0-rc1 is out. I guess I could also include a fix (or revert) by that
time.

I think it is a good plan.

As for the Kontron SL/BL i.MX6UL/ULL boards the U-Boot DTs are more up-to-date than the kernel ones, it would be good if you, Marcel, could just revert the changes in the next round of patches and exclude the boards from your sync with 6.0-rc1 as any changes to the kernel DTs I will eventually come up with will land in 6.1 at the earliest.

Thanks
Frieder

#28 lore raw

Re: [PATCH v1 08/26] imx6ul/imx6ull: synchronise device trees with linux

Am 03.08.22 um 15:21 schrieb Frieder Schrempf:

Quoted 37 lines

Hi Marcel, hi Stefano,

Am 03.08.22 um 15:02 schrieb Stefano Babic:

Quoted 34 lines · Marcel Ziswiler
Quoted 20 lines

Hi Frieder

Quoted 9 lines · Frieder Schrempf

Hi Marcel,

Am 21.07.22 um 15:27 schrieb Marcel Ziswiler:

Quoted 5 lines

From: Marcel Ziswiler <[email protected]>

Synchronise device trees with linux v5.19-rc5.

Quoted 7 lines

Thanks for the sync patches!

Unfortunately this will break the Kontron SL/BL i.MX6UL/ULL boards (N6x1x). The reason is that the U-Boot devicetrees received some simplification and renaming that haven't been upstreamed to the kernel, yet. I will add updating the kernel DTs to my to-do list and would recommend to drop the Kontron DT changes from this patch for now.

Quoted 4 lines

Sorry about that. I did not expect Stefano to apply all of this that quickly. On the other hand we can be very
grateful that he reacted that promptly this time around (;-p).

:-D

Quoted 5 lines

Anyway, please let me know if I can be of service to correct any of this. Like I wrote in [1] I plan to re-sync
again and fix a few review comments once 6.0-rc1 is out. I guess I could also include a fix (or revert) by that
time.

Quoted 7 lines
Quoted 1 line

I think it is a good plan.

As for the Kontron SL/BL i.MX6UL/ULL boards the U-Boot DTs are more up-to-date than the kernel ones, it would be good if you, Marcel, could just revert the changes in the next round of patches and exclude the boards from your sync with 6.0-rc1 as any changes to the kernel DTs I will eventually come up with will land in 6.1 at the earliest.

I sent out a big devicetree rework for the board to the kernel list (see [1]) and it got applied, so I assume it will be part of Linux 6.1.

Based on this I also created patches that among other things sync the U-Boot devicetrees for the Kontron SL/BL i.MX6UL/ULL boards with the upcoming changes in Linux (see [2]).

[1]
https://patchwork.kernel.org/project/linux-arm-kernel/cover/[email protected]/
[2]
https://patchwork.ozlabs.org/project/uboot/cover/[email protected]/

#29 lore raw

PATCH 9/26 colibri-imx6ull/-emmc: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

Please note that this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device trees we are now using the regular ones for the Colibri Evaluation (carrier) board V3 (e.g. imx6ull-colibri-eval-v3.dtb rather than the previous imx6ull-colibri.dtb and imx6ull-colibri-emmc-eval-v3.dtb rather than the previous imx6ull-colibri-emmc.dtb).

---

 arch/arm/dts/Makefile                         |   4 +-
 .../imx6ull-colibri-emmc-eval-v3-u-boot.dtsi  |   1 +
 arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts |  17 +
 .../arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi | 187 ++++++
 arch/arm/dts/imx6ull-colibri-emmc.dts         |  49 --
 ...si => imx6ull-colibri-eval-v3-u-boot.dtsi} |   4 +-
 arch/arm/dts/imx6ull-colibri-eval-v3.dts      |  14 +
 arch/arm/dts/imx6ull-colibri-eval-v3.dtsi     | 121 ++++
 arch/arm/dts/imx6ull-colibri-nonwifi.dtsi     | 161 +++++
 arch/arm/dts/imx6ull-colibri.dts              |  45 --
 arch/arm/dts/imx6ull-colibri.dtsi             | 558 +++++++++++-------
 board/toradex/colibri-imx6ull/MAINTAINERS     |   7 +-
 configs/colibri-imx6ull-emmc_defconfig        |   2 +-
 configs/colibri-imx6ull_defconfig             |   2 +-
 14 files changed, 872 insertions(+), 300 deletions(-)
 create mode 120000 arch/arm/dts/imx6ull-colibri-emmc-eval-v3-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts
 create mode 100644 arch/arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi
 delete mode 100644 arch/arm/dts/imx6ull-colibri-emmc.dts
 rename arch/arm/dts/{imx6ull-colibri-u-boot.dtsi => imx6ull-colibri-eval-v3-u-boot.dtsi} (91%)
 create mode 100644 arch/arm/dts/imx6ull-colibri-eval-v3.dts
 create mode 100644 arch/arm/dts/imx6ull-colibri-eval-v3.dtsi
 create mode 100644 arch/arm/dts/imx6ull-colibri-nonwifi.dtsi
 delete mode 100644 arch/arm/dts/imx6ull-colibri.dts
arch/arm/dts/Makefile +2 -2
index fd18e57b945..5890ee1fecf 100644
@@ -883,8 +883,8 @@ dtb-$(CONFIG_MX6UL) += \
 
 dtb-$(CONFIG_MX6ULL) += \
 	imx6ull-14x14-evk.dtb \
-	imx6ull-colibri.dtb \
-	imx6ull-colibri-emmc.dtb \
+	imx6ull-colibri-emmc-eval-v3.dtb \
+	imx6ull-colibri-eval-v3.dtb \
 	imx6ull-myir-mys-6ulx-eval.dtb \
 	imx6ull-seeed-npi-imx6ull-dev-board.dtb \
 	imx6ull-phytec-segin-ff-rdk-emmc.dtb \
arch/arm/dts/imx6ull-colibri-emmc-eval-v3-u-boot.dtsi new file +1 -0
new file mode 120000
index 00000000000..1edf4030992
@@ -0,0 +1 @@
+imx6ull-colibri-eval-v3-u-boot.dtsi
\ No newline at end of file
arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts new file +17 -0
new file mode 100644
index 00000000000..61b93cb040c
@@ -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";
+};
arch/arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi new file +187 -0

187 lines not on this page · raw message

arch/arm/dts/imx6ull-colibri-emmc.dts deleted +0 -49

49 lines not on this page · raw message

arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi renamed from arch/arm/dts/imx6ull-colibri-u-boot.dtsi +2 -2
similarity index 91%
rename from arch/arm/dts/imx6ull-colibri-u-boot.dtsi
rename to arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi
index afdb0f43cf0..65dfeab5bb2 100644
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2019 Toradex AG
+ * Copyright 2019-2022 Toradex
  */
 
 / {
arch/arm/dts/imx6ull-colibri-eval-v3.dts new file +14 -0
new file mode 100644
index 00000000000..9bf7111d7b0
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2018-2022 Toradex
+ */
+
+/dts-v1/;
+
+#include "imx6ull-colibri-nonwifi.dtsi"
+#include "imx6ull-colibri-eval-v3.dtsi"
+
+/ {
+	model = "Toradex Colibri iMX6ULL 256/512MB on Colibri Evaluation Board V3";
+	compatible = "toradex,colibri-imx6ull-eval", "fsl,imx6ull";
+};
arch/arm/dts/imx6ull-colibri-eval-v3.dtsi new file +121 -0

121 lines not on this page · raw message

arch/arm/dts/imx6ull-colibri-nonwifi.dtsi new file +161 -0

161 lines not on this page · raw message

arch/arm/dts/imx6ull-colibri.dts deleted +0 -45

45 lines not on this page · raw message

arch/arm/dts/imx6ull-colibri.dtsi +360 -198

857 lines not on this page · raw message

board/toradex/colibri-imx6ull/MAINTAINERS +5 -2
index 500c787b8e5..37c485aa6b7 100644
@@ -3,9 +3,12 @@ M:	Marcel Ziswiler <[email protected]>
 W:	http://developer.toradex.com/software/linux/linux-software
 W:	https://www.toradex.com/community
 S:	Maintained
-F:	arch/arm/dts/imx6ull-colibri.dts
 F:	arch/arm/dts/imx6ull-colibri.dtsi
-F:	arch/arm/dts/imx6ull-colibri-emmc.dts
+F:	arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts
+F:	arch/arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi
+F:	arch/arm/dts/imx6ull-colibri-eval-v3.dts
+F:	arch/arm/dts/imx6ull-colibri-eval-v3.dtsi
+F:	arch/arm/dts/imx6ull-colibri-nonwifi.dtsi
 F:	arch/arm/dts/imx6ull-colibri-u-boot.dtsi
 F:	board/toradex/colibri-imx6ull/
 F:	configs/colibri-imx6ull_defconfig
configs/colibri-imx6ull-emmc_defconfig +1 -1
index bfbbf34ae5c..f57f2d0a957 100644
@@ -8,7 +8,7 @@ CONFIG_MX6ULL=y
 CONFIG_TARGET_COLIBRI_IMX6ULL=y
 CONFIG_DM_GPIO=y
 CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri-emmc"
+CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri-emmc-eval-v3"
 CONFIG_SYS_MEMTEST_START=0x80000000
 CONFIG_SYS_MEMTEST_END=0x88000000
 CONFIG_DISTRO_DEFAULTS=y
configs/colibri-imx6ull_defconfig +1 -1
index a4225d862b4..299278e8e72 100644
@@ -9,7 +9,7 @@ CONFIG_MX6ULL=y
 CONFIG_TARGET_COLIBRI_IMX6ULL=y
 CONFIG_DM_GPIO=y
 CONFIG_TARGET_COLIBRI_IMX6ULL_NAND=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri"
+CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri-eval-v3"
 CONFIG_SYS_MEMTEST_START=0x80000000
 CONFIG_SYS_MEMTEST_END=0x88000000
 CONFIG_DISTRO_DEFAULTS=y
Signature · 1 line
2.35.1
#30 lore raw

PATCH 9/26 colibri-imx6ull/-emmc: synchronise device tree with linux

Quoted 9 lines

From: Marcel Ziswiler <[email protected]> Synchronise device tree with linux v5.19-rc5.
Please note that this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device trees we are now using the regular ones for the Colibri Evaluation (carrier) board V3 (e.g. imx6ull-colibri-eval-v3.dtb rather than the previous imx6ull-colibri.dtb and imx6ull-colibri-emmc-eval-v3.dtb rather than the previous imx6ull-colibri-emmc.dtb).

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#31 lore raw

PATCH 10/26 imx: imx7-cm: prepare to synchronise device trees with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

As a preparatory step rename the qspi1 reference to qspi as this is how it is named in the Linux upstream device tree.

This avoids the following error once synchronised:

+Error: arch/arm/dts/.imx7-cm.dtb.pre.tmp:96.1-7 Label or path qspi1 not
found

---

 arch/arm/dts/imx7-cm.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/imx7-cm.dts +1 -1
index da20a63ae9e..6fde55ad020 100644
@@ -93,7 +93,7 @@
 	};
 };
 
-&qspi1 {
+&qspi {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_qspi1_1>;
 	status = "okay";
Signature · 1 line
2.35.1
#32 lore raw

PATCH 10/26 imx: imx7-cm: prepare to synchronise device trees with linux

Quoted 7 lines

From: Marcel Ziswiler <[email protected]>
As a preparatory step rename the qspi1 reference to qspi as this is how it is named in the Linux upstream device tree.
This avoids the following error once synchronised:
+Error: arch/arm/dts/.imx7-cm.dtb.pre.tmp:96.1-7 Label or path qspi1 not
found

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#33 lore raw

PATCH 11/26 imx: imx7d-sdb: prepare to synchronise device trees with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

As a preparatory step remove the epdc reference which does not exist in the Linux upstream device tree and rename the qspi1 reference to qspi as this is how it is named in the Linux upstream device tree.

This avoids the following error once synchronised:

+Error: arch/arm/dts/.imx7d-sdb-qspi.dtb.pre.tmp:10.1-6 Label or path
epdc not found
+Error: arch/arm/dts/.imx7d-sdb-qspi.dtb.pre.tmp:29.1-7 Label or path
qspi1 not found
+Error: arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi:6.1-7 Label or path
qspi1 not found

---

 arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi | 2 +-
 arch/arm/dts/imx7d-sdb-qspi.dts         | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)
arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi +1 -1
index 585af6d211f..62cdcbaeb67 100644
@@ -3,7 +3,7 @@
  * Copyright 2018 NXP
  */
 
-&qspi1 {
+&qspi {
 	flash0: mx25l51245g@0 {
 		compatible = "jedec,spi-nor";
 	};
arch/arm/dts/imx7d-sdb-qspi.dts +1 -6
index 9bb4c743c14..9215d7c6160 100644
@@ -6,11 +6,6 @@
 
 #include "imx7d-sdb.dts"
 
-/* disable epdc, conflict with qspi */
-&epdc {
-        status = "disabled";
-};
-
 &iomuxc {
 	qspi1 {
 		pinctrl_qspi1_1: qspi1grp_1 {
@@ -26,7 +21,7 @@
 	};
 };
 
-&qspi1 {
+&qspi {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_qspi1_1>;
 	status = "okay";
Signature · 1 line
2.35.1
#34 lore raw

PATCH 11/26 imx: imx7d-sdb: prepare to synchronise device trees with linux

Quoted 11 lines

From: Marcel Ziswiler <[email protected]>
As a preparatory step remove the epdc reference which does not exist in the Linux upstream device tree and rename the qspi1 reference to qspi as this is how it is named in the Linux upstream device tree. This avoids the following error once synchronised:

(quoted diff) +3 -0
+Error: arch/arm/dts/.imx7d-sdb-qspi.dtb.pre.tmp:10.1-6 Label or path
 epdc not found
+Error: arch/arm/dts/.imx7d-sdb-qspi.dtb.pre.tmp:29.1-7 Label or path
 qspi1 not found
+Error: arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi:6.1-7 Label or path
 qspi1 not found
Quoted 1 line

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#35 lore raw

PATCH 12/26 imx7s/d: synchronise device trees with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux-next next-20220708.

---

 arch/arm/dts/imx7d-pico-hobbit.dts      |   6 +-
 arch/arm/dts/imx7d-pico-pi.dts          |   6 +-
 arch/arm/dts/imx7d-pico.dtsi            | 103 +++++-
 arch/arm/dts/imx7d-pinfunc.h            |  14 +-
 arch/arm/dts/imx7d-sdb.dts              | 120 +++++-
 arch/arm/dts/imx7d-smegw01.dts          | 297 ++++++++++++++-
 arch/arm/dts/imx7d.dtsi                 | 211 +++++++----
 arch/arm/dts/imx7s-warp.dts             |  70 +++-
 arch/arm/dts/imx7s.dtsi                 | 472 +++++++++++++++---------
 include/dt-bindings/clock/imx7d-clock.h |  13 +-
 include/dt-bindings/power/imx7-power.h  |   5 +-
 11 files changed, 1021 insertions(+), 296 deletions(-)
arch/arm/dts/imx7d-pico-hobbit.dts +3 -3
index 98604f0fa65..d917dc4f2f2 100644
@@ -31,7 +31,7 @@
 
 		dailink_master: simple-audio-card,codec {
 			sound-dai = <&sgtl5000>;
-			clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+			clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
 		};
 	};
 };
@@ -41,7 +41,7 @@
 		#sound-dai-cells = <0>;
 		reg = <0x0a>;
 		compatible = "fsl,sgtl5000";
-		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
 		VDDA-supply = <&reg_2p5v>;
 		VDDIO-supply = <&reg_vref_1v8>;
 	};
@@ -102,4 +102,4 @@
 			MX7D_PAD_EPDC_DATA13__GPIO2_IO13	0x14
 		>;
 	};
-};
\ No newline at end of file
+};
arch/arm/dts/imx7d-pico-pi.dts +3 -3
index 66ca59045f3..f263e391e24 100644
@@ -31,7 +31,7 @@
 
 		dailink_master: simple-audio-card,codec {
 			sound-dai = <&sgtl5000>;
-			clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+			clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
 		};
 	};
 };
@@ -41,7 +41,7 @@
 		#sound-dai-cells = <0>;
 		reg = <0x0a>;
 		compatible = "fsl,sgtl5000";
-		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
 		VDDA-supply = <&reg_2p5v>;
 		VDDIO-supply = <&reg_vref_1v8>;
 	};
@@ -90,4 +90,4 @@
 		>;
 	};
 
-};
\ No newline at end of file
+};
arch/arm/dts/imx7d-pico.dtsi +96 -7

168 lines not on this page · raw message

arch/arm/dts/imx7d-pinfunc.h +5 -9
index f2493bc63da..69f2c1ec825 100644
@@ -1,10 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2014-2015 Freescale Semiconductor, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  */
 
 #ifndef __DTS_IMX7D_PINFUNC_H
@@ -592,11 +588,11 @@
 #define MX7D_PAD_UART2_RX_DATA__UART2_DCE_RX                      0x0130 0x03A0 0x06FC 0x0 0x2
 #define MX7D_PAD_UART2_RX_DATA__UART2_DTE_TX                      0x0130 0x03A0 0x0000 0x0 0x0
 #define MX7D_PAD_UART2_RX_DATA__I2C2_SCL                          0x0130 0x03A0 0x05DC 0x1 0x0
-#define MX7D_PAD_UART2_RX_DATA__SAI3_RX_BCLK                      0x0130 0x03A0 0x0000 0x2 0x0
+#define MX7D_PAD_UART2_RX_DATA__SAI3_RX_BCLK                      0x0130 0x03A0 0x06C4 0x2 0x0
 #define MX7D_PAD_UART2_RX_DATA__ECSPI1_SS3                        0x0130 0x03A0 0x0000 0x3 0x0
 #define MX7D_PAD_UART2_RX_DATA__ENET2_1588_EVENT1_IN              0x0130 0x03A0 0x0000 0x4 0x0
 #define MX7D_PAD_UART2_RX_DATA__GPIO4_IO2                         0x0130 0x03A0 0x0000 0x5 0x0
-#define MX7D_PAD_UART2_RX_DATA__ENET2_MDIO                        0x0130 0x03A0 0x0000 0x6 0x0
+#define MX7D_PAD_UART2_RX_DATA__ENET2_MDIO                        0x0130 0x03A0 0x0574 0x6 0x1
 #define MX7D_PAD_UART2_TX_DATA__UART2_DCE_TX                      0x0134 0x03A4 0x0000 0x0 0x0
 #define MX7D_PAD_UART2_TX_DATA__UART2_DTE_RX                      0x0134 0x03A4 0x06FC 0x0 0x3
 #define MX7D_PAD_UART2_TX_DATA__I2C2_SDA                          0x0134 0x03A4 0x05E0 0x1 0x0
@@ -1112,13 +1108,13 @@
 #define MX7D_PAD_ENET1_RGMII_TD3__GPIO7_IO9                       0x0250 0x04C0 0x0000 0x5 0x0
 #define MX7D_PAD_ENET1_RGMII_TD3__CAAM_RNG_OSC_OBS                0x0250 0x04C0 0x0000 0x7 0x0
 #define MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL           0x0254 0x04C4 0x0000 0x0 0x0
-#define MX7D_PAD_ENET1_RGMII_TX_CTL__SAI1_RX_SYNC                 0x0254 0x04C4 0x0000 0x2 0x0
+#define MX7D_PAD_ENET1_RGMII_TX_CTL__SAI1_RX_SYNC                 0x0254 0x04C4 0x06A4 0x2 0x1
 #define MX7D_PAD_ENET1_RGMII_TX_CTL__GPT2_COMPARE1                0x0254 0x04C4 0x0000 0x3 0x0
 #define MX7D_PAD_ENET1_RGMII_TX_CTL__EPDC_PWR_CTRL2               0x0254 0x04C4 0x0000 0x4 0x0
 #define MX7D_PAD_ENET1_RGMII_TX_CTL__GPIO7_IO10                   0x0254 0x04C4 0x0000 0x5 0x0
 #define MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC                 0x0258 0x04C8 0x0000 0x0 0x0
 #define MX7D_PAD_ENET1_RGMII_TXC__ENET1_TX_ER                     0x0258 0x04C8 0x0000 0x1 0x0
-#define MX7D_PAD_ENET1_RGMII_TXC__SAI1_RX_BCLK                    0x0258 0x04C8 0x0000 0x2 0x0
+#define MX7D_PAD_ENET1_RGMII_TXC__SAI1_RX_BCLK                    0x0258 0x04C8 0x069C 0x2 0x1
 #define MX7D_PAD_ENET1_RGMII_TXC__GPT2_COMPARE2                   0x0258 0x04C8 0x0000 0x3 0x0
 #define MX7D_PAD_ENET1_RGMII_TXC__EPDC_PWR_CTRL3                  0x0258 0x04C8 0x0000 0x4 0x0
 #define MX7D_PAD_ENET1_RGMII_TXC__GPIO7_IO11                      0x0258 0x04C8 0x0000 0x5 0x0
arch/arm/dts/imx7d-sdb.dts +112 -8

180 lines not on this page · raw message

arch/arm/dts/imx7d-smegw01.dts +287 -10

399 lines not on this page · raw message

arch/arm/dts/imx7d.dtsi +138 -73

268 lines not on this page · raw message

arch/arm/dts/imx7s-warp.dts +66 -4

132 lines not on this page · raw message

arch/arm/dts/imx7s.dtsi +305 -167

894 lines not on this page · raw message

include/dt-bindings/clock/imx7d-clock.h +5 -8
index b2325d3e236..1d4c0dfe020 100644
@@ -1,10 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2014-2015 Freescale Semiconductor, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  */
 
 #ifndef __DT_BINDINGS_CLOCK_IMX7D_H
@@ -168,7 +164,7 @@
 #define IMX7D_SPDIF_ROOT_SRC		155
 #define IMX7D_SPDIF_ROOT_CG		156
 #define IMX7D_SPDIF_ROOT_DIV		157
-#define IMX7D_ENET1_REF_ROOT_CLK	158
+#define IMX7D_ENET1_IPG_ROOT_CLK        158
 #define IMX7D_ENET1_REF_ROOT_SRC	159
 #define IMX7D_ENET1_REF_ROOT_CG		160
 #define IMX7D_ENET1_REF_ROOT_DIV	161
@@ -176,7 +172,7 @@
 #define IMX7D_ENET1_TIME_ROOT_SRC	163
 #define IMX7D_ENET1_TIME_ROOT_CG	164
 #define IMX7D_ENET1_TIME_ROOT_DIV	165
-#define IMX7D_ENET2_REF_ROOT_CLK	166
+#define IMX7D_ENET2_IPG_ROOT_CLK        166
 #define IMX7D_ENET2_REF_ROOT_SRC	167
 #define IMX7D_ENET2_REF_ROOT_CG		168
 #define IMX7D_ENET2_REF_ROOT_DIV	169
@@ -455,5 +451,6 @@
 #define IMX7D_SNVS_CLK			442
 #define IMX7D_CAAM_CLK			443
 #define IMX7D_KPP_ROOT_CLK		444
-#define IMX7D_CLK_END			445
+#define IMX7D_PXP_CLK			445
+#define IMX7D_CLK_END			446
 #endif /* __DT_BINDINGS_CLOCK_IMX7D_H */
include/dt-bindings/power/imx7-power.h +1 -4
index 3a181e41051..597c1aa06ae 100644
@@ -1,9 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  *  Copyright (C) 2017 Impinj
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef __DT_BINDINGS_IMX7_POWER_H__
Signature · 1 line
2.35.1
#36 lore raw

PATCH 12/26 imx7s/d: synchronise device trees with linux

Quoted 3 lines

From: Marcel Ziswiler <[email protected]> Synchronise device tree with linux-next next-20220708.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#37 lore raw

PATCH 13/26 colibri-imx7d/-emmc: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux-next next-20220708.

Please note that this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device trees we are now using the regular ones for the Colibri Evaluation (carrier) board V3 (e.g. imx7d-colibri-eval-v3.dtb rather than the previous imx7-colibri-rawnand.dtb and imx7d-colibri-emmc-eval-v3.dtb rather than the previous imx7-colibri-emmc.dtb).

Please further note that the PMIC node name got changed from rn5t567@33 to pmic@33 which required adjustment in resp. board file board/toradex/colibri_imx7/colibri_imx7.c.

---

 arch/arm/dts/Makefile                         |    4 +-
 arch/arm/dts/imx7-colibri-emmc.dts            |   94 --
 arch/arm/dts/imx7-colibri-eval-v3.dtsi        |  110 ++
 arch/arm/dts/imx7-colibri-rawnand.dts         |   96 --
 arch/arm/dts/imx7-colibri.dtsi                | 1156 +++++++++++++++--
 .../imx7d-colibri-emmc-eval-v3-u-boot.dtsi    |    1 +
 arch/arm/dts/imx7d-colibri-emmc-eval-v3.dts   |   21 +
 arch/arm/dts/imx7d-colibri-emmc.dtsi          |   61 +
 ...dtsi => imx7d-colibri-eval-v3-u-boot.dtsi} |   10 +-
 arch/arm/dts/imx7d-colibri-eval-v3.dts        |   56 +
 arch/arm/dts/imx7d-colibri.dtsi               |   35 +
 board/toradex/colibri_imx7/MAINTAINERS        |   14 +-
 board/toradex/colibri_imx7/colibri_imx7.c     |    4 +-
 configs/colibri_imx7_defconfig                |    2 +-
 configs/colibri_imx7_emmc_defconfig           |    2 +-
 15 files changed, 1325 insertions(+), 341 deletions(-)
 delete mode 100644 arch/arm/dts/imx7-colibri-emmc.dts
 create mode 100644 arch/arm/dts/imx7-colibri-eval-v3.dtsi
 delete mode 100644 arch/arm/dts/imx7-colibri-rawnand.dts
 create mode 120000 arch/arm/dts/imx7d-colibri-emmc-eval-v3-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx7d-colibri-emmc-eval-v3.dts
 create mode 100644 arch/arm/dts/imx7d-colibri-emmc.dtsi
 rename arch/arm/dts/{imx7-colibri-u-boot.dtsi => imx7d-colibri-eval-v3-u-boot.dtsi} (79%)
 create mode 100644 arch/arm/dts/imx7d-colibri-eval-v3.dts
 create mode 100644 arch/arm/dts/imx7d-colibri.dtsi
arch/arm/dts/Makefile +2 -2
index 5890ee1fecf..dcd827d011b 100644
@@ -905,8 +905,8 @@ dtb-$(CONFIG_EV_IMX280_NANO_X_MB) += \
 dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \
 	imx7d-sdb-qspi.dtb \
 	imx7-cm.dtb \
-	imx7-colibri-emmc.dtb \
-	imx7-colibri-rawnand.dtb \
+	imx7d-colibri-emmc-eval-v3.dtb \
+	imx7d-colibri-eval-v3.dtb \
 	imx7s-warp.dtb \
 	imx7d-meerkat96.dtb \
 	imx7d-pico-pi.dtb \
arch/arm/dts/imx7-colibri-emmc.dts deleted +0 -94

94 lines not on this page · raw message

arch/arm/dts/imx7-colibri-eval-v3.dtsi new file +110 -0

110 lines not on this page · raw message

arch/arm/dts/imx7-colibri-rawnand.dts deleted +0 -96

96 lines not on this page · raw message

arch/arm/dts/imx7-colibri.dtsi +1019 -137

1,280 lines not on this page · raw message

arch/arm/dts/imx7d-colibri-emmc-eval-v3-u-boot.dtsi new file +1 -0
new file mode 120000
index 00000000000..0a28237d313
@@ -0,0 +1 @@
+imx7d-colibri-eval-v3-u-boot.dtsi
\ No newline at end of file
arch/arm/dts/imx7d-colibri-emmc-eval-v3.dts new file +21 -0
new file mode 100644
index 00000000000..6d505cb02aa
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2017-2022 Toradex
+ */
+
+/dts-v1/;
+#include "imx7d-colibri-emmc.dtsi"
+#include "imx7-colibri-eval-v3.dtsi"
+
+/ {
+	model = "Toradex Colibri iMX7D 1GB (eMMC) on Colibri Evaluation Board V3";
+	compatible = "toradex,colibri-imx7d-emmc-eval-v3",
+		     "toradex,colibri-imx7d-emmc",
+		     "toradex,colibri-imx7d",
+		     "fsl,imx7d";
+};
+
+/* Colibri USBH */
+&usbotg2 {
+	status = "okay";
+};
arch/arm/dts/imx7d-colibri-emmc.dtsi new file +61 -0

61 lines not on this page · raw message

arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi renamed from arch/arm/dts/imx7-colibri-u-boot.dtsi +8 -2
similarity index 79%
rename from arch/arm/dts/imx7-colibri-u-boot.dtsi
rename to arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi
index 91386476d55..1bf3f4a4aa7 100644
@@ -1,8 +1,14 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2020 Toradex
+ * Copyright 2020-2022 Toradex
  */
 
+&{/aliases} {
+	/* SDHCI instance order: eMMC, SD/MMC */
+	mmc0 = &usdhc3;
+	mmc1 = &usdhc1;
+};
+
 &lcdif {
 	status = "okay";
 	pinctrl-names = "default";
arch/arm/dts/imx7d-colibri-eval-v3.dts new file +56 -0

56 lines not on this page · raw message

arch/arm/dts/imx7d-colibri.dtsi new file +35 -0
new file mode 100644
index 00000000000..531a45b176a
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2016-2022 Toradex
+ */
+
+#include "imx7d.dtsi"
+#include "imx7-colibri.dtsi"
+
+/ {
+	aliases {
+		/* Required to properly pass MAC addresses from bootloader. */
+		ethernet0 = &fec1;
+		ethernet1 = &fec2;
+	};
+
+	memory@80000000 {
+		device_type = "memory";
+		reg = <0x80000000 0x20000000>;
+	};
+};
+
+&cpu1 {
+	cpu-supply = <&reg_DCDC2>;
+};
+
+/* NAND */
+&gpmi {
+	status = "okay";
+};
+
+/* Colibri USBH */
+&usbotg2 {
+	dr_mode = "host";
+	vbus-supply = <&reg_usbh_vbus>;
+};
board/toradex/colibri_imx7/MAINTAINERS +8 -6
index 24bec3ef14e..513679a41c8 100644
@@ -3,12 +3,14 @@ M:	Marcel Ziswiler <[email protected]>
 W:	http://developer.toradex.com/software/linux/linux-software
 W:	https://www.toradex.com/community
 S:	Maintained
+F:	arch/arm/boot/dts/imx7-colibri.dtsi
+F:	arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
+F:	arch/arm/boot/dts/imx7d-colibri.dtsi
+F:	arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
+F:	arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts
+F:	arch/arm/boot/dts/imx7d-colibri-eval-v3.dts
 F:	board/toradex/colibri_imx7/
-F:	doc/board/toradex/colibri_imx7.rst
-F:	include/configs/colibri_imx7.h
 F:	configs/colibri_imx7_defconfig
 F:	configs/colibri_imx7_emmc_defconfig
-F:	arch/arm/dts/imx7-colibri.dtsi
-F:	arch/arm/dts/imx7-colibri-u-boot.dtsi
-F:	arch/arm/dts/imx7-colibri-emmc.dts
-F:	arch/arm/dts/imx7-colibri-rawnand.dts
+F:	doc/board/toradex/colibri_imx7.rst
+F:	include/configs/colibri_imx7.h
board/toradex/colibri_imx7/colibri_imx7.c +2 -2
index 486299b5e93..4f04543832e 100644
@@ -207,7 +207,7 @@ int power_init_board(void)
 	int ret;
 
 
-	ret = pmic_get("rn5t567@33", &dev);
+	ret = pmic_get("pmic@33", &dev);
 	if (ret)
 		return ret;
 	ver = pmic_reg_read(dev, RN5T567_LSIVER);
@@ -241,7 +241,7 @@ void reset_cpu(void)
 {
 	struct udevice *dev;
 
-	pmic_get("rn5t567@33", &dev);
+	pmic_get("pmic@33", &dev);
 
 	/* Use PMIC to reset, set REPWRTIM to 0 and REPWRON to 1 */
 	pmic_reg_write(dev, RN5T567_REPCNT, 0x1);
configs/colibri_imx7_defconfig +1 -1
index 15dae6b3db9..fbc660eb4e9 100644
@@ -5,7 +5,7 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x380000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-rawnand"
+CONFIG_DEFAULT_DEVICE_TREE="imx7d-colibri-eval-v3"
 CONFIG_TARGET_COLIBRI_IMX7=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
configs/colibri_imx7_emmc_defconfig +1 -1
index 361077ee84e..ea1aa4c3a64 100644
@@ -4,7 +4,7 @@ CONFIG_SYS_MALLOC_LEN=0x2000000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFDE00
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-emmc"
+CONFIG_DEFAULT_DEVICE_TREE="imx7d-colibri-emmc-eval-v3"
 CONFIG_TARGET_COLIBRI_IMX7=y
 CONFIG_TARGET_COLIBRI_IMX7_EMMC=y
 CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
Signature · 1 line
2.35.1
#38 lore raw

PATCH 13/26 colibri-imx7d/-emmc: synchronise device tree with linux

Quoted 11 lines

From: Marcel Ziswiler <[email protected]> Synchronise device tree with linux-next next-20220708. Please note that this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device trees we are now using the regular ones for the Colibri Evaluation (carrier) board V3 (e.g. imx7d-colibri-eval-v3.dtb rather than the previous imx7-colibri-rawnand.dtb and imx7d-colibri-emmc-eval-v3.dtb rather than the previous imx7-colibri-emmc.dtb).
Please further note that the PMIC node name got changed from rn5t567@33 to pmic@33 which required adjustment in resp. board file board/toradex/colibri_imx7/colibri_imx7.c.

Quoted 1 line

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#39 lore raw

PATCH 14/26 ARM: DTS: bk4r1/pcm052: prepare to synchronise device trees with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

As a preparatory step rename the included SoC dtsi from vf.dtsi to vf610.dtsi as this is how it is named in Linux upstream.

---

 arch/arm/dts/vf610-pcm052.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/vf610-pcm052.dtsi +1 -1
index 1383d03c227..ccdc0f57e2b 100644
@@ -6,7 +6,7 @@
  */
 
 /dts-v1/;
-#include "vf.dtsi"
+#include "vf610.dtsi"
 #include "vf610-pinfunc.h"
 
 / {
Signature · 1 line
2.35.1
#40 lore raw

PATCH 14/26 ARM: DTS: bk4r1/pcm052: prepare to synchronise device trees with linux

Quoted 4 lines

From: Marcel Ziswiler <[email protected]>
As a preparatory step rename the included SoC dtsi from vf.dtsi to vf610.dtsi as this is how it is named in Linux upstream.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#41 lore raw

PATCH 15/26 vf500/vf610: synchronise device trees with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device trees with linux v5.19-rc5.

---

 arch/arm/dts/vf.dtsi         | 229 -----------
 arch/arm/dts/vf500.dtsi      |  64 +++
 arch/arm/dts/vf610-pinfunc.h |   6 +-
 arch/arm/dts/vf610-twr.dts   | 364 ++++++++++++++++-
 arch/arm/dts/vf610.dtsi      |  20 +
 arch/arm/dts/vfxxx.dtsi      | 756 +++++++++++++++++++++++++++++++++++
 6 files changed, 1199 insertions(+), 240 deletions(-)
 delete mode 100644 arch/arm/dts/vf.dtsi
 create mode 100644 arch/arm/dts/vf500.dtsi
 create mode 100644 arch/arm/dts/vf610.dtsi
 create mode 100644 arch/arm/dts/vfxxx.dtsi
arch/arm/dts/vf.dtsi deleted +0 -229
deleted file mode 100644
index 1bdaf3de230..00000000000
@@ -1,229 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
-/*
- * Copyright 2013 Freescale Semiconductor, Inc.
- */
-/include/ "skeleton.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-
-/ {
-	aliases {
-		gpio0 = &gpio0;
-		gpio1 = &gpio1;
-		gpio2 = &gpio2;
-		gpio3 = &gpio3;
-		gpio4 = &gpio4;
-		serial0 = &uart0;
-		serial1 = &uart1;
-		serial2 = &uart2;
-		serial3 = &uart3;
-		serial4 = &uart4;
-		serial5 = &uart5;
-		spi0 = &dspi0;
-		spi1 = &dspi1;
-		ehci0 = &ehci0;
-		ehci1 = &ehci1;
-		i2c0 = &i2c0;
-		i2c1 = &i2c1;
-		i2c2 = &i2c2;
-		i2c3 = &i2c3;
-	};
-
-	soc {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "simple-bus";
-		ranges;
-
-		aips0: bus@40000000 {
-			compatible = "fsl,aips-bus", "simple-bus";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			reg = <0x40000000 0x00070000>;
-			ranges;
-
-			uart0: serial@40027000 {
-				compatible = "fsl,vf610-lpuart";
-				reg = <0x40027000 0x1000>;
-				status = "disabled";
-			};
-
-			uart1: serial@40028000 {
-				compatible = "fsl,vf610-lpuart";
-				reg = <0x40028000 0x1000>;
-				status = "disabled";
-			};
-
-			uart2: serial@40029000 {
-				compatible = "fsl,vf610-lpuart";
-				reg = <0x40029000 0x1000>;
-				status = "disabled";
-			};
-
-			uart3: serial@4002a000 {
-				compatible = "fsl,vf610-lpuart";
-				reg = <0x4002a000 0x1000>;
-				status = "disabled";
-			};
-
-			dspi0: dspi0@4002c000 {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				compatible = "fsl,vf610-dspi";
-				reg = <0x4002c000 0x1000>;
-				spi-num-chipselects = <5>;
-				status = "disabled";
-			};
-
-			dspi1: dspi1@4002d000 {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				compatible = "fsl,vf610-dspi";
-				reg = <0x4002d000 0x1000>;
-				spi-num-chipselects = <5>;
-				status = "disabled";
-			};
-
-			qspi0: quadspi@40044000 {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				compatible = "fsl,vf610-qspi";
-				reg = <0x40044000 0x1000>,
-					  <0x20000000 0x10000000>;
-				reg-names = "QuadSPI", "QuadSPI-memory";
-				status = "disabled";
-			};
-
-			i2c0: i2c@40066000 {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				compatible = "fsl,vf610-i2c";
-				reg = <0x40066000 0x1000>;
-				status = "disabled";
-			};
-
-			i2c1: i2c@40067000 {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				compatible = "fsl,vf610-i2c";
-				reg = <0x40067000 0x1000>;
-				status = "disabled";
-			};
-
-			iomuxc: iomuxc@40048000 {
-				compatible = "fsl,vf610-iomuxc";
-				reg = <0x40048000 0x1000>;
-				fsl,mux_mask = <0x700000>;
-			};
-
-			gpio0: gpio@40049000 {
-				compatible = "fsl,vf610-gpio";
-				reg = <0x400ff000 0x40>;
-				#gpio-cells = <2>;
-			};
-
-			gpio1: gpio@4004a000 {
-				compatible = "fsl,vf610-gpio";
-				reg = <0x400ff040 0x40>;
-				#gpio-cells = <2>;
-			};
-
-			gpio2: gpio@4004b000 {
-				compatible = "fsl,vf610-gpio";
-				reg = <0x400ff080 0x40>;
-				#gpio-cells = <2>;
-			};
-
-			gpio3: gpio@4004c000 {
-				compatible = "fsl,vf610-gpio";
-				reg = <0x400ff0c0 0x40>;
-				#gpio-cells = <2>;
-			};
-
-			gpio4: gpio@4004d000 {
-				compatible = "fsl,vf610-gpio";
-				reg = <0x400ff100 0x40>;
-				#gpio-cells = <2>;
-			};
-
-			dcu0: dcu@40058000 {
-				compatible = "fsl,vf610-dcu";
-				reg = <0x40058000 0x1200>;
-				status = "disabled";
-			};
-
-			ehci0: ehci@40034000 {
-				compatible = "fsl,vf610-usb";
-				reg = <0x40034000 0x800>;
-				status = "disabled";
-			};
-		};
-
-		aips1: bus@40080000 {
-			compatible = "fsl,aips-bus", "simple-bus";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			reg = <0x40080000 0x0007f000>;
-			ranges;
-
-			uart4: serial@400a9000 {
-				compatible = "fsl,vf610-lpuart";
-				reg = <0x400a9000 0x1000>;
-				status = "disabled";
-			};
-
-			uart5: serial@400aa000 {
-				compatible = "fsl,vf610-lpuart";
-				reg = <0x400aa000 0x1000>;
-				status = "disabled";
-			};
-
-			ehci1: ehci@400b4000 {
-				compatible = "fsl,vf610-usb";
-				reg = <0x400b4000 0x800>;
-				status = "disabled";
-			};
-
-			esdhc1: esdhc@400b2000 {
-				compatible = "fsl,esdhc";
-				reg = <0x400b2000 0x1000>;
-				status = "disabled";
-			};
-
-			fec0: fec@400d0000 {
-			      compatible = "fsl,mvf600-fec";
-			      reg = <0x400d0000 0x1000>;
-			      status = "disabled";
-			};
-
-			fec1: fec@400d1000 {
-			      compatible = "fsl,mvf600-fec";
-			      reg = <0x400d1000 0x1000>;
-			      status = "disabled";
-			};
-
-			nfc: nand@400e0000 {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				compatible = "fsl,vf610-nfc";
-				reg = <0x400e0000 0x4000>;
-				status = "disabled";
-			};
-
-			i2c2: i2c@400e6000 {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				compatible = "fsl,vf610-i2c";
-				reg = <0x400e6000 0x1000>;
-				status = "disabled";
-			};
-
-			i2c3: i2c@400e7000 {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				compatible = "fsl,vf610-i2c";
-				reg = <0x400e7000 0x1000>;
-				status = "disabled";
-			};
-		};
-	};
-};
arch/arm/dts/vf500.dtsi new file +64 -0

64 lines not on this page · raw message

arch/arm/dts/vf610-pinfunc.h +1 -5
index e079edf3067..740276431aa 100644
@@ -1,10 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright 2013 Freescale Semiconductor, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  */
 
 #ifndef __DTS_VF610_PINFUNC_H
arch/arm/dts/vf610-twr.dts +358 -6

379 lines not on this page · raw message

arch/arm/dts/vf610.dtsi new file +20 -0
new file mode 100644
index 00000000000..2fba923821d
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+//
+// Copyright 2013 Freescale Semiconductor, Inc.
+
+#include "vf500.dtsi"
+
+&a5_cpu {
+	next-level-cache = <&L2>;
+};
+
+&aips0 {
+	L2: cache-controller@40006000 {
+		compatible = "arm,pl310-cache";
+		reg = <0x40006000 0x1000>;
+		cache-unified;
+		cache-level = <2>;
+		arm,data-latency = <3 3 3>;
+		arm,tag-latency = <2 2 2>;
+	};
+};
arch/arm/dts/vfxxx.dtsi new file +756 -0

756 lines not on this page · raw message

Signature · 1 line
2.35.1
#42 lore raw

PATCH 15/26 vf500/vf610: synchronise device trees with linux

Quoted 3 lines

From: Marcel Ziswiler <[email protected]> Synchronise device trees with linux v5.19-rc5.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#43 lore raw

PATCH 16/26 colibri_vf: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

Please note that this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device tree we are now using the regular one for the Colibri Evaluation (carrier) board V3 (e.g. vf610-colibri-eval-v3.dtb rather than the previous vf610-colibri.dtb).

---

 arch/arm/dts/Makefile                         |   3 +-
 arch/arm/dts/vf-colibri-eval-v3.dtsi          | 152 ++++++
 arch/arm/dts/vf-colibri-u-boot.dtsi           |  27 -
 arch/arm/dts/vf-colibri.dtsi                  | 474 +++++++++++-------
 arch/arm/dts/vf500-colibri.dts                |  13 -
 .../arm/dts/vf610-colibri-eval-v3-u-boot.dtsi |  90 ++++
 arch/arm/dts/vf610-colibri-eval-v3.dts        |  13 +
 arch/arm/dts/vf610-colibri.dts                |  13 -
 arch/arm/dts/vf610-colibri.dtsi               |  22 +
 board/toradex/colibri_vf/MAINTAINERS          |  10 +-
 configs/colibri_vf_defconfig                  |   2 +-
 include/dt-bindings/clock/vf610-clock.h       | 202 ++++++++
 12 files changed, 774 insertions(+), 247 deletions(-)
 create mode 100644 arch/arm/dts/vf-colibri-eval-v3.dtsi
 delete mode 100644 arch/arm/dts/vf-colibri-u-boot.dtsi
 delete mode 100644 arch/arm/dts/vf500-colibri.dts
 create mode 100644 arch/arm/dts/vf610-colibri-eval-v3-u-boot.dtsi
 create mode 100644 arch/arm/dts/vf610-colibri-eval-v3.dts
 delete mode 100644 arch/arm/dts/vf610-colibri.dts
 create mode 100644 arch/arm/dts/vf610-colibri.dtsi
 create mode 100644 include/dt-bindings/clock/vf610-clock.h
arch/arm/dts/Makefile +1 -2
index dcd827d011b..5f8e9b529b8 100644
@@ -727,8 +727,7 @@ dtb-$(CONFIG_MACH_SUN9I) += \
 	sun9i-a80-cubieboard4.dtb \
 	sun9i-a80-cx-a99.dtb
 
-dtb-$(CONFIG_VF610) += vf500-colibri.dtb \
-	vf610-colibri.dtb \
+dtb-$(CONFIG_VF610) += vf610-colibri-eval-v3.dtb \
 	vf610-twr.dtb \
 	vf610-pcm052.dtb \
 	vf610-bk4r1.dtb
arch/arm/dts/vf-colibri-eval-v3.dtsi new file +152 -0

152 lines not on this page · raw message

arch/arm/dts/vf-colibri-u-boot.dtsi deleted +0 -27
deleted file mode 100644
index 2294ee9551e..00000000000
@@ -1,27 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
-
-/ {
-	soc {
-		u-boot,dm-pre-reloc;
-	};
-};
-
-&aips0 {
-	u-boot,dm-pre-reloc;
-};
-
-&pinctrl_ddr {
-	u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-	u-boot,dm-pre-reloc;
-};
-
-&uart0 {
-	u-boot,dm-pre-reloc;
-};
-
-&dcu0 {
-	u-boot,dm-pre-reloc;
-};
arch/arm/dts/vf-colibri.dtsi +288 -186

536 lines not on this page · raw message

arch/arm/dts/vf500-colibri.dts deleted +0 -13
deleted file mode 100644
index c83a16fdcb8..00000000000
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
-/*
- * Copyright 2014 Toradex AG
- */
-
-/dts-v1/;
-#include "vf-colibri.dtsi"
-#include "vf-colibri-u-boot.dtsi"
-
-/ {
-	model = "Toradex Colibri VF50";
-	compatible = "toradex,vf500-colibri_vf50", "toradex,vf500-colibri_vf50", "fsl,vf500";
-};
arch/arm/dts/vf610-colibri-eval-v3-u-boot.dtsi new file +90 -0

90 lines not on this page · raw message

arch/arm/dts/vf610-colibri-eval-v3.dts new file +13 -0
new file mode 100644
index 00000000000..fb661e8a2dc
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * Copyright 2014-2020 Toradex
+ */
+
+/dts-v1/;
+#include "vf610-colibri.dtsi"
+#include "vf-colibri-eval-v3.dtsi"
+
+/ {
+	model = "Toradex Colibri VF61 on Colibri Evaluation Board";
+	compatible = "toradex,vf610-colibri_vf61-on-eval", "toradex,vf610-colibri_vf61", "fsl,vf610";
+};
arch/arm/dts/vf610-colibri.dts deleted +0 -13
deleted file mode 100644
index 7275fec279f..00000000000
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
-/*
- * Copyright 2014 Toradex AG
- */
-
-/dts-v1/;
-#include "vf-colibri.dtsi"
-#include "vf-colibri-u-boot.dtsi"
-
-/ {
-	model = "Toradex Colibri VF61";
-	compatible = "toradex,vf610-colibri_vf61", "toradex,vf610-colibri_vf61", "fsl,vf610";
-};
arch/arm/dts/vf610-colibri.dtsi new file +22 -0
new file mode 100644
index 00000000000..607cec2df86
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * Copyright 2014-2020 Toradex
+ */
+
+#include "vf610.dtsi"
+#include "vf-colibri.dtsi"
+
+/ {
+	model = "Toradex Colibri VF61 COM";
+	compatible = "toradex,vf610-colibri_vf61", "fsl,vf610";
+
+	memory@80000000 {
+		device_type = "memory";
+		reg = <0x80000000 0x10000000>;
+	};
+};
+
+&nfc {
+	assigned-clocks = <&clks VF610_CLK_NFC>;
+	assigned-clock-rates = <50000000>;
+};
board/toradex/colibri_vf/MAINTAINERS +5 -5
index 9f18b9a39d4..f821a3334b6 100644
@@ -3,10 +3,10 @@ M:	Marcel Ziswiler <[email protected]>
 W:	http://developer.toradex.com/software/linux/linux-software
 W:	https://www.toradex.com/community
 S:	Maintained
-F:	board/toradex/colibri_vf/
-F:	include/configs/colibri_vf.h
-F:	configs/colibri_vf_defconfig
 F:	arch/arm/dts/vf-colibri.dtsi
-F:	arch/arm/dts/vf-colibri-u-boot.dtsi
-F:	arch/arm/dts/vf500-colibri.dts
+F:	arch/arm/dts/vf-colibri-eval-v3.dtsi
+F:	arch/arm/dts/vf610-colibri-eval-v3-u-boot.dtsi
 F:	arch/arm/dts/vf610-colibri.dts
+F:	board/toradex/colibri_vf/
+F:	configs/colibri_vf_defconfig
+F:	include/configs/colibri_vf.h
configs/colibri_vf_defconfig +1 -1
index 9dbe6280dd7..febfdbcff05 100644
@@ -8,7 +8,7 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x180000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
+CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri-eval-v3"
 CONFIG_TARGET_COLIBRI_VF=y
 CONFIG_SYS_LOAD_ADDR=0x80008000
 CONFIG_SYS_MEMTEST_START=0x80010000
include/dt-bindings/clock/vf610-clock.h new file +202 -0

202 lines not on this page · raw message

Signature · 1 line
2.35.1
#44 lore raw

PATCH 16/26 colibri_vf: synchronise device tree with linux

Quoted 7 lines

From: Marcel Ziswiler <[email protected]> Synchronise device tree with linux v5.19-rc5.
Please note that this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device tree we are now using the regular one for the Colibri Evaluation (carrier) board V3 (e.g. vf610-colibri-eval-v3.dtb rather than the previous vf610-colibri.dtb).

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#45 lore raw

PATCH 17/26 imx8mm-venice-gw700x: prepare to synchronise device trees with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

As a preparatory step remove the pinctrl_pmic reference which does not exist in the Linux upistream device tree.

This avoids the following error once synchronised:

+Error: arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi:26.1-14 Label or
path pinctrl_pmic not found

---

 arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi | 4 ----
 1 file changed, 4 deletions(-)
arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi +0 -4
index 76702438515..0cdc7b779f1 100644
@@ -22,7 +22,3 @@
 &{/soc@0/bus@30800000/i2c@30a20000/pmic@69/regulators} {
 	u-boot,dm-spl;
 };
-
-&pinctrl_pmic {
-	u-boot,dm-spl;
-};
Signature · 1 line
2.35.1
#46 lore raw

PATCH 17/26 imx8mm-venice-gw700x: prepare to synchronise device trees with linux

Quoted 7 lines

From: Marcel Ziswiler <[email protected]>
As a preparatory step remove the pinctrl_pmic reference which does not exist in the Linux upistream device tree.
This avoids the following error once synchronised:
+Error: arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi:26.1-14 Label or
path pinctrl_pmic not found

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#47 lore raw

PATCH 18/26 imx8mm: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

---

 arch/arm/dts/imx8mm-beacon-baseboard.dtsi    | 118 ++++
 arch/arm/dts/imx8mm-data-modul-edm-sbc.dts   |   3 +-
 arch/arm/dts/imx8mm-evk-u-boot.dtsi          |   4 +-
 arch/arm/dts/imx8mm-evk.dts                  |   2 +-
 arch/arm/dts/imx8mm-evk.dtsi                 | 195 ++++--
 arch/arm/dts/imx8mm-icore-mx8mm-ctouch2.dts  |   1 -
 arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2.dts |   1 -
 arch/arm/dts/imx8mm-mx8menlo.dts             |  51 +-
 arch/arm/dts/imx8mm-pinfunc.h                |   6 +-
 arch/arm/dts/imx8mm-u-boot.dtsi              |  10 +
 arch/arm/dts/imx8mm-venice-gw700x.dtsi       |  11 +-
 arch/arm/dts/imx8mm-venice-gw71xx.dtsi       |  56 +-
 arch/arm/dts/imx8mm-venice-gw72xx.dtsi       |  85 ++-
 arch/arm/dts/imx8mm-venice-gw73xx.dtsi       |  86 ++-
 arch/arm/dts/imx8mm-venice-gw7901.dts        | 126 ++--
 arch/arm/dts/imx8mm-venice-gw7902.dts        | 119 +++-
 arch/arm/dts/imx8mm-venice-gw7903.dts        |   5 +
 arch/arm/dts/imx8mm.dtsi                     | 637 +++++++++++++------
 include/dt-bindings/clock/imx8mm-clock.h     |   9 +-
 include/dt-bindings/power/imx8mm-power.h     |   9 +
 20 files changed, 1162 insertions(+), 372 deletions(-)
arch/arm/dts/imx8mm-beacon-baseboard.dtsi +118 -0
index 4097a66163b..f338a886d81 100644
@@ -3,6 +3,8 @@
  * Copyright 2020 Compass Electronics Group, LLC
  */
 
+#include <dt-bindings/phy/phy-imx8-pcie.h>
+
 / {
 	leds {
 		compatible = "gpio-leds";
@@ -34,6 +36,19 @@
 		};
 	};
 
+	pcie0_refclk: pcie0-refclk {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <100000000>;
+	};
+
+	pcie0_refclk_gated:  pcie0-refclk-gated {
+		compatible = "gpio-gate-clock";
+		clocks = <&pcie0_refclk>;
+		#clock-cells = <0>;
+		enable-gpios = <&pca6416_1 2 GPIO_ACTIVE_LOW>;
+	};
+
 	reg_audio: regulator-audio {
 		compatible = "regulator-fixed";
 		regulator-name = "3v3_aud";
@@ -54,6 +69,26 @@
 		enable-active-high;
 	};
 
+	reg_camera: regulator-camera {
+		compatible = "regulator-fixed";
+		regulator-name = "mipi_pwr";
+		regulator-min-microvolt = <2800000>;
+		regulator-max-microvolt = <2800000>;
+		gpio = <&pca6416_1 0 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		startup-delay-us = <100000>;
+	};
+
+	reg_pcie0: regulator-pcie {
+		compatible = "regulator-fixed";
+		regulator-name = "pci_pwr_en";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		enable-active-high;
+		gpio = <&pca6416_1 1 GPIO_ACTIVE_HIGH>;
+		startup-delay-us = <100000>;
+	};
+
 	reg_usdhc2_vmmc: regulator-usdhc2 {
 		compatible = "regulator-fixed";
 		regulator-name = "VSD_3V3";
@@ -78,6 +113,10 @@
 	};
 };
 
+&csi {
+	status = "okay";
+};
+
 &ecspi2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_espi2>;
@@ -101,6 +140,30 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c2>;
 	status = "okay";
+
+	camera@3c {
+		compatible = "ovti,ov5640";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_ov5640>;
+		reg = <0x3c>;
+		clocks = <&clk IMX8MM_CLK_CLKO1>;
+		clock-names = "xclk";
+		assigned-clocks = <&clk IMX8MM_CLK_CLKO1>;
+		assigned-clock-parents = <&clk IMX8MM_CLK_24M>;
+		assigned-clock-rates = <24000000>;
+		AVDD-supply = <&reg_camera>;  /* 2.8v */
+		powerdown-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+
+		port {
+			/* MIPI CSI-2 bus endpoint */
+			ov5640_to_mipi_csi2: endpoint {
+				remote-endpoint = <&imx8mm_mipi_csi_in>;
+				clock-lanes = <0>;
+				data-lanes = <1 2>;
+			};
+		};
+	};
 };
 
 &i2c4 {
@@ -152,6 +215,44 @@
 	};
 };
 
+&mipi_csi {
+	status = "okay";
+	ports {
+		port@0 {
+			imx8mm_mipi_csi_in: endpoint {
+				remote-endpoint = <&ov5640_to_mipi_csi2>;
+				data-lanes = <1 2>;
+			};
+		};
+	};
+};
+
+&pcie_phy {
+	fsl,refclk-pad-mode = <IMX8_PCIE_REFCLK_PAD_INPUT>;
+	fsl,tx-deemph-gen1 = <0x2d>;
+	fsl,tx-deemph-gen2 = <0xf>;
+	fsl,clkreq-unsupported;
+	clocks = <&pcie0_refclk_gated>;
+	clock-names = "ref";
+	status = "okay";
+};
+
+&pcie0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_pcie0>;
+	reset-gpio = <&gpio4 21 GPIO_ACTIVE_LOW>;
+	clocks = <&clk IMX8MM_CLK_PCIE1_ROOT>, <&clk IMX8MM_CLK_PCIE1_AUX>,
+		 <&pcie0_refclk_gated>;
+	clock-names = "pcie", "pcie_aux", "pcie_bus";
+	assigned-clocks = <&clk IMX8MM_CLK_PCIE1_AUX>,
+			  <&clk IMX8MM_CLK_PCIE1_CTRL>;
+	assigned-clock-rates = <10000000>, <250000000>;
+	assigned-clock-parents = <&clk IMX8MM_SYS_PLL2_50M>,
+				 <&clk IMX8MM_SYS_PLL2_250M>;
+	vpcie-supply = <&reg_pcie0>;
+	status = "okay";
+};
+
 &sai3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_sai3>;
@@ -177,6 +278,7 @@
 	pinctrl-0 = <&pinctrl_uart3>;
 	assigned-clocks = <&clk IMX8MM_CLK_UART3>;
 	assigned-clock-parents = <&clk IMX8MM_SYS_PLL1_80M>;
+	uart-has-rtscts;
 	status = "okay";
 };
 
@@ -238,6 +340,14 @@
 		>;
 	};
 
+	pinctrl_ov5640: ov5640grp {
+		fsl,pins = <
+			MX8MM_IOMUXC_GPIO1_IO07_GPIO1_IO7		0x19
+			MX8MM_IOMUXC_GPIO1_IO06_GPIO1_IO6		0x19
+			MX8MM_IOMUXC_GPIO1_IO14_CCMSRCGPCMIX_CLKO1	0x59
+		>;
+	};
+
 	pinctrl_pcal6414: pcal6414-gpiogrp {
 		fsl,pins = <
 			MX8MM_IOMUXC_SAI2_MCLK_GPIO4_IO27		0x19
@@ -250,6 +360,12 @@
 		>;
 	};
 
+	pinctrl_pcie0: pcie0grp {
+		fsl,pins = <
+			MX8MM_IOMUXC_SAI2_RXFS_GPIO4_IO21       0x41
+		>;
+	};
+
 	pinctrl_sai3: sai3grp {
 		fsl,pins = <
 			MX8MM_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC     0xd6
@@ -271,6 +387,8 @@
 		fsl,pins = <
 			MX8MM_IOMUXC_ECSPI1_SCLK_UART3_DCE_RX	0x40
 			MX8MM_IOMUXC_ECSPI1_MOSI_UART3_DCE_TX	0x40
+			MX8MM_IOMUXC_ECSPI1_MISO_UART3_DCE_CTS_B	0x40
+			MX8MM_IOMUXC_ECSPI1_SS0_UART3_DCE_RTS_B	0x40
 		>;
 	};
 
arch/arm/dts/imx8mm-data-modul-edm-sbc.dts +2 -1
index 5b022040902..778bdbe228d 100644
@@ -35,7 +35,7 @@
 		brightness-levels = <0 1 10 20 30 40 50 60 70 75 80 90 100>;
 		default-brightness-level = <7>;
 		enable-gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>;
-		pwms = <&pwm1 0 5000000>;
+		pwms = <&pwm1 0 5000000 0>;
 		/* Disabled by default, unless display board plugged in. */
 		status = "disabled";
 	};
@@ -962,6 +962,7 @@
 };
 
 &usbotg2 {
+	disable-over-current;
 	dr_mode = "host";
 	status = "okay";
 };
arch/arm/dts/imx8mm-evk-u-boot.dtsi +2 -2
index e9fbf7b8021..36fbf56bc55 100644
@@ -105,11 +105,11 @@
 	u-boot,dm-spl;
 };
 
-&{/soc@0/bus@30800000/i2c@30a20000/pca9450@25} {
+&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
 	u-boot,dm-spl;
 };
 
-&{/soc@0/bus@30800000/i2c@30a20000/pca9450@25/regulators} {
+&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b/regulators} {
 	u-boot,dm-spl;
 };
 
arch/arm/dts/imx8mm-evk.dts +1 -1
index 4e2820d1924..a2b24d4d4e3 100644
@@ -48,7 +48,7 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		spi-max-frequency = <80000000>;
-		spi-tx-bus-width = <4>;
+		spi-tx-bus-width = <1>;
 		spi-rx-bus-width = <4>;
 	};
 };
arch/arm/dts/imx8mm-evk.dtsi +126 -69

298 lines not on this page · raw message

arch/arm/dts/imx8mm-icore-mx8mm-ctouch2.dts +0 -1
index 5389d6f2beb..50274540284 100644
@@ -91,7 +91,6 @@
 	max-frequency = <50000000>;
 	bus-width = <4>;
 	no-1-8-v;
-	pm-ignore-notify;
 	keep-power-in-suspend;
 	status = "okay";
 };
arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2.dts +0 -1
index a4a2ada1483..ddac8bc7ae6 100644
@@ -91,7 +91,6 @@
 	max-frequency = <50000000>;
 	bus-width = <4>;
 	no-1-8-v;
-	pm-ignore-notify;
 	keep-power-in-suspend;
 	status = "okay";
 };
arch/arm/dts/imx8mm-mx8menlo.dts +30 -21

107 lines not on this page · raw message

arch/arm/dts/imx8mm-pinfunc.h +3 -3
index a7411c800be..83c8f715cd9 100644
@@ -280,7 +280,7 @@
 #define MX8MM_IOMUXC_SAI5_RXD2_SAI1_TX_DATA4                                0x150 0x3B8 0x000 0x1 0x0
 #define MX8MM_IOMUXC_SAI5_RXD2_SAI1_TX_SYNC                                 0x150 0x3B8 0x4CC 0x2 0x1
 #define MX8MM_IOMUXC_SAI5_RXD2_SAI5_TX_BCLK                                 0x150 0x3B8 0x4E8 0x3 0x0
-#define MX8MM_IOMUXC_SAI5_RXD2_PDM_DATA2                                    0x150 0x3B8 0x53c 0x4 0x0
+#define MX8MM_IOMUXC_SAI5_RXD2_PDM_DATA2                                    0x150 0x3B8 0x53C 0x4 0x0
 #define MX8MM_IOMUXC_SAI5_RXD2_GPIO3_IO23                                   0x150 0x3B8 0x000 0x5 0x0
 #define MX8MM_IOMUXC_SAI5_RXD3_SAI5_RX_DATA3                                0x154 0x3BC 0x4E0 0x0 0x0
 #define MX8MM_IOMUXC_SAI5_RXD3_SAI1_TX_DATA5                                0x154 0x3BC 0x000 0x1 0x0
@@ -487,7 +487,7 @@
 #define MX8MM_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC                                 0x1D8 0x440 0x000 0x0 0x0
 #define MX8MM_IOMUXC_SAI3_TXFS_GPT1_CAPTURE2                                0x1D8 0x440 0x000 0x1 0x0
 #define MX8MM_IOMUXC_SAI3_TXFS_SAI5_RX_DATA1                                0x1D8 0x440 0x4D8 0x2 0x2
-#define MX8MM_IOMUXC_SAI3_TXFS_UART2_DCE_RX                                 0x1D8 0x440 0x4Fc 0x4 0x2
+#define MX8MM_IOMUXC_SAI3_TXFS_UART2_DCE_RX                                 0x1D8 0x440 0x4FC 0x4 0x2
 #define MX8MM_IOMUXC_SAI3_TXFS_UART2_DTE_TX                                 0x1D8 0x440 0x000 0x4 0x0
 #define MX8MM_IOMUXC_SAI3_TXFS_GPIO4_IO31                                   0x1D8 0x440 0x000 0x5 0x0
 #define MX8MM_IOMUXC_SAI3_TXFS_TPSMP_HDATA1                                 0x1D8 0x440 0x000 0x7 0x0
@@ -495,7 +495,7 @@
 #define MX8MM_IOMUXC_SAI3_TXC_GPT1_COMPARE2                                 0x1DC 0x444 0x000 0x1 0x0
 #define MX8MM_IOMUXC_SAI3_TXC_SAI5_RX_DATA2                                 0x1DC 0x444 0x4DC 0x2 0x2
 #define MX8MM_IOMUXC_SAI3_TXC_UART2_DCE_TX                                  0x1DC 0x444 0x000 0x4 0x0
-#define MX8MM_IOMUXC_SAI3_TXC_UART2_DTE_RX                                  0x1DC 0x444 0x4Fc 0x4 0x3
+#define MX8MM_IOMUXC_SAI3_TXC_UART2_DTE_RX                                  0x1DC 0x444 0x4FC 0x4 0x3
 #define MX8MM_IOMUXC_SAI3_TXC_GPIO5_IO0                                     0x1DC 0x444 0x000 0x5 0x0
 #define MX8MM_IOMUXC_SAI3_TXC_TPSMP_HDATA2                                  0x1DC 0x444 0x000 0x7 0x0
 #define MX8MM_IOMUXC_SAI3_TXD_SAI3_TX_DATA0                                 0x1E0 0x448 0x000 0x0 0x0
arch/arm/dts/imx8mm-u-boot.dtsi +10 -0
index 9f66cdb65a9..852d63a8aae 100644
@@ -180,3 +180,13 @@
 	u-boot,dm-pre-reloc;
 	u-boot,dm-spl;
 };
+
+&spba1 {
+	u-boot,dm-pre-reloc;
+	u-boot,dm-spl;
+};
+
+&spba2 {
+	u-boot,dm-pre-reloc;
+	u-boot,dm-spl;
+};
arch/arm/dts/imx8mm-venice-gw700x.dtsi +2 -9
index f182a816b57..00f86cada30 100644
@@ -111,7 +111,8 @@
 			reg = <0>;
 			ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
 			ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
-			ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
+			tx-fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
+			rx-fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
 		};
 	};
 };
@@ -277,8 +278,6 @@
 
 	pmic@69 {
 		compatible = "mps,mp5416";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_pmic>;
 		reg = <0x69>;
 
 		regulators {
@@ -443,12 +442,6 @@
 		>;
 	};
 
-	pinctrl_pmic: pmicgrp {
-		fsl,pins = <
-			MX8MM_IOMUXC_GPIO1_IO03_GPIO1_IO3	0x41
-		>;
-	};
-
 	pinctrl_uart2: uart2grp {
 		fsl,pins = <
 			MX8MM_IOMUXC_UART2_RXD_UART2_DCE_RX	0x140
arch/arm/dts/imx8mm-venice-gw71xx.dtsi +54 -2

107 lines not on this page · raw message

arch/arm/dts/imx8mm-venice-gw72xx.dtsi +83 -2

139 lines not on this page · raw message

arch/arm/dts/imx8mm-venice-gw73xx.dtsi +84 -2

146 lines not on this page · raw message

arch/arm/dts/imx8mm-venice-gw7901.dts +88 -38

222 lines not on this page · raw message

arch/arm/dts/imx8mm-venice-gw7902.dts +101 -18

220 lines not on this page · raw message

arch/arm/dts/imx8mm-venice-gw7903.dts +5 -0
index 9c67a381b77..a7dae9bd4c1 100644
@@ -540,6 +540,7 @@
 	fsl,refclk-pad-mode = <IMX8_PCIE_REFCLK_PAD_INPUT>;
 	fsl,clkreq-unsupported;
 	clocks = <&pcie0_refclk>;
+	clock-names = "ref";
 	status = "okay";
 };
 
@@ -558,6 +559,10 @@
 	status = "okay";
 };
 
+&pgc_mipi {
+	status = "disabled";
+};
+
 /* off-board RS232/RS485/RS422 */
 &uart1 {
 	pinctrl-names = "default";
arch/arm/dts/imx8mm.dtsi +436 -201

836 lines not on this page · raw message

include/dt-bindings/clock/imx8mm-clock.h +8 -1
index e63a5530aed..1f768b2eeb1 100644
@@ -274,6 +274,13 @@
 
 #define IMX8MM_CLK_A53_CORE			251
 
-#define IMX8MM_CLK_END				252
+#define IMX8MM_CLK_CLKOUT1_SEL			252
+#define IMX8MM_CLK_CLKOUT1_DIV			253
+#define IMX8MM_CLK_CLKOUT1			254
+#define IMX8MM_CLK_CLKOUT2_SEL			255
+#define IMX8MM_CLK_CLKOUT2_DIV			256
+#define IMX8MM_CLK_CLKOUT2			257
+
+#define IMX8MM_CLK_END				258
 
 #endif
include/dt-bindings/power/imx8mm-power.h +9 -0
index fc9c2e16aad..648938f24c8 100644
@@ -19,4 +19,13 @@
 #define IMX8MM_POWER_DOMAIN_DISPMIX	10
 #define IMX8MM_POWER_DOMAIN_MIPI	11
 
+#define IMX8MM_VPUBLK_PD_G1		0
+#define IMX8MM_VPUBLK_PD_G2		1
+#define IMX8MM_VPUBLK_PD_H1		2
+
+#define IMX8MM_DISPBLK_PD_CSI_BRIDGE	0
+#define IMX8MM_DISPBLK_PD_LCDIF		1
+#define IMX8MM_DISPBLK_PD_MIPI_DSI	2
+#define IMX8MM_DISPBLK_PD_MIPI_CSI	3
+
 #endif
Signature · 1 line
2.35.1
#48 lore raw

PATCH 18/26 imx8mm: synchronise device tree with linux

Quoted 3 lines

From: Marcel Ziswiler <[email protected]> Synchronise device tree with linux v5.19-rc5.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#49 lore raw

PATCH 19/26 imx8mm-kontron-n801x-s-lvds: fix pwms property warnings

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Fix the following build-time pwms property warnings:

w+arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3

---

 arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts +1 -0
index dd1addea708..40c14734e22 100644
@@ -87,6 +87,7 @@
 &pwm1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm1>;
+	#pwm-cells = <2>;
 	status = "okay";
 };
 
Signature · 1 line
2.35.1
#50 lore raw

PATCH 19/26 imx8mm-kontron-n801x-s-lvds: fix pwms property warnings

Quoted 5 lines

From: Marcel Ziswiler <[email protected]>
Fix the following build-time pwms property warnings:
w+arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dtb: Warning (pwms_property):
/backlight:pwms: property size (12) too small for cell size 3

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#51 lore raw

PATCH 20/26 imx8mm-mx8menlo/verdin-imx8mm: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

Please note that this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device tree we are now using the regular one for the Verdin Development (carrier) board (e.g. imx8mm-verdin-wifi-dev.dtb rather than the previous imx8mm-verdin.dtb).

Please further note that the PMIC node name got changed from a pmic label to pmic@25 which required adjustment in resp. board SPL file board/toradex/verdin-imx8mm/spl.c.

---

 arch/arm/dts/Makefile                         |    2 +-
 arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi      |    2 +-
 arch/arm/dts/imx8mm-verdin-dahlia.dtsi        |  150 ++
 arch/arm/dts/imx8mm-verdin-dev.dtsi           |   67 +
 ...tsi => imx8mm-verdin-wifi-dev-u-boot.dtsi} |   48 +-
 arch/arm/dts/imx8mm-verdin-wifi-dev.dts       |   18 +
 arch/arm/dts/imx8mm-verdin-wifi.dtsi          |   94 ++
 arch/arm/dts/imx8mm-verdin.dts                | 1031 -------------
 arch/arm/dts/imx8mm-verdin.dtsi               | 1295 +++++++++++++++++
 board/toradex/verdin-imx8mm/MAINTAINERS       |    8 +-
 board/toradex/verdin-imx8mm/spl.c             |    2 +-
 configs/verdin-imx8mm_defconfig               |    2 +-
 12 files changed, 1674 insertions(+), 1045 deletions(-)
 create mode 100644 arch/arm/dts/imx8mm-verdin-dahlia.dtsi
 create mode 100644 arch/arm/dts/imx8mm-verdin-dev.dtsi
 rename arch/arm/dts/{imx8mm-verdin-u-boot.dtsi => imx8mm-verdin-wifi-dev-u-boot.dtsi} (53%)
 create mode 100644 arch/arm/dts/imx8mm-verdin-wifi-dev.dts
 create mode 100644 arch/arm/dts/imx8mm-verdin-wifi.dtsi
 delete mode 100644 arch/arm/dts/imx8mm-verdin.dts
 create mode 100644 arch/arm/dts/imx8mm-verdin.dtsi
arch/arm/dts/Makefile +1 -1
index 5f8e9b529b8..64f12419701 100644
@@ -946,7 +946,7 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
 	imx8mm-venice-gw7901.dtb \
 	imx8mm-venice-gw7902.dtb \
 	imx8mm-venice-gw7903.dtb \
-	imx8mm-verdin.dtb \
+	imx8mm-verdin-wifi-dev.dtb \
 	phycore-imx8mm.dtb \
 	imx8mn-bsh-smm-s2.dtb \
 	imx8mn-bsh-smm-s2pro.dtb \
arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi +1 -1
index b87cef9bf99..66cc97842c0 100644
@@ -2,7 +2,7 @@
 /*
  * Copyright 2021-2022 Marek Vasut <[email protected]>
  */
-#include "imx8mm-verdin-u-boot.dtsi"
+#include "imx8mm-verdin-wifi-dev-u-boot.dtsi"
 
 / {
 	chosen {
arch/arm/dts/imx8mm-verdin-dahlia.dtsi new file +150 -0

150 lines not on this page · raw message

arch/arm/dts/imx8mm-verdin-dev.dtsi new file +67 -0

67 lines not on this page · raw message

arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi renamed from arch/arm/dts/imx8mm-verdin-u-boot.dtsi +40 -8

73 lines not on this page · raw message

arch/arm/dts/imx8mm-verdin-wifi-dev.dts new file +18 -0
new file mode 100644
index 00000000000..ef952021832
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2022 Toradex
+ */
+
+/dts-v1/;
+
+#include "imx8mm-verdin.dtsi"
+#include "imx8mm-verdin-wifi.dtsi"
+#include "imx8mm-verdin-dev.dtsi"
+
+/ {
+	model = "Toradex Verdin iMX8M Mini WB on Verdin Development Board";
+	compatible = "toradex,verdin-imx8mm-wifi-dev",
+		     "toradex,verdin-imx8mm-wifi",
+		     "toradex,verdin-imx8mm",
+		     "fsl,imx8mm";
+};
arch/arm/dts/imx8mm-verdin-wifi.dtsi new file +94 -0

94 lines not on this page · raw message

arch/arm/dts/imx8mm-verdin.dts deleted +0 -1031

1,031 lines not on this page · raw message

arch/arm/dts/imx8mm-verdin.dtsi new file +1295 -0

1,295 lines not on this page · raw message

board/toradex/verdin-imx8mm/MAINTAINERS +6 -2
index 7965975d0bf..974b3a10329 100644
@@ -2,8 +2,12 @@ Verdin iMX8M Mini
 M:	Marcel Ziswiler <[email protected]>
 W:	https://www.toradex.com/computer-on-modules/verdin-arm-family/nxp-imx-8m-mini
 S:	Maintained
-F:	arch/arm/dts/imx8mm-verdin.dts
-F:	arch/arm/dts/imx8mm-verdin-u-boot.dtsi
+F:	arch/arm/dts/imx8mm-verdin.dtsi
+F:	arch/arm/dts/imx8mm-verdin-dahlia.dtsi
+F:	arch/arm/dts/imx8mm-verdin-dev.dtsi
+F:	arch/arm/dts/imx8mm-verdin-wifi.dtsi
+F:	arch/arm/dts/imx8mm-verdin-wifi-dev.dts
+F:	arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
 F:	board/toradex/verdin-imx8mm/
 F:	configs/verdin-imx8mm_defconfig
 F:	doc/board/toradex/verdin-imx8mm.rst
board/toradex/verdin-imx8mm/spl.c +1 -1
index 037fd273ceb..243c97e0ba0 100644
@@ -86,7 +86,7 @@ int power_init_board(void)
 	int ret;
 
 	if (IS_ENABLED(CONFIG_SPL_DM_PMIC_PCA9450)) {
-		ret = pmic_get("pmic", &dev);
+		ret = pmic_get("pmic@25", &dev);
 		if (ret == -ENODEV) {
 			puts("No pmic found\n");
 			return ret;
configs/verdin-imx8mm_defconfig +1 -1
index 34afdc57911..31dc65b3ce7 100644
@@ -8,7 +8,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xFFFFDE00
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx8mm-verdin"
+CONFIG_DEFAULT_DEVICE_TREE="imx8mm-verdin-wifi-dev"
 CONFIG_SPL_TEXT_BASE=0x7E1000
 CONFIG_TARGET_VERDIN_IMX8MM=y
 CONFIG_SPL_MMC=y
Signature · 1 line
2.35.1
#52 lore raw

PATCH 20/26 imx8mm-mx8menlo/verdin-imx8mm: synchronise device tree with linux

Quoted 10 lines

From: Marcel Ziswiler <[email protected]> Synchronise device tree with linux v5.19-rc5.
Please note that this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device tree we are now using the regular one for the Verdin Development (carrier) board (e.g. imx8mm-verdin-wifi-dev.dtb rather than the previous imx8mm-verdin.dtb). Please further note that the PMIC node name got changed from a pmic label to pmic@25 which required adjustment in resp. board SPL file board/toradex/verdin-imx8mm/spl.c.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#53 lore raw

PATCH 21/26 imx8mn: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

---

 arch/arm/dts/imx8mn-beacon-baseboard.dtsi  |   4 +-
 arch/arm/dts/imx8mn-beacon-som.dtsi        |  12 +-
 arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi | 113 ++++-----
 arch/arm/dts/imx8mn-bsh-smm-s2pro.dts      |  90 +++++++
 arch/arm/dts/imx8mn-ddr4-evk.dts           |   4 +
 arch/arm/dts/imx8mn-evk-u-boot.dtsi        |   4 +-
 arch/arm/dts/imx8mn-evk.dts                |  56 ++---
 arch/arm/dts/imx8mn-evk.dtsi               | 121 +++++++++
 arch/arm/dts/imx8mn-var-som.dtsi           |  15 +-
 arch/arm/dts/imx8mn-venice-gw7902.dts      |  80 ++++--
 arch/arm/dts/imx8mn.dtsi                   | 270 ++++++++++++++-------
 board/freescale/imx8mn_evk/spl.c           |   2 +-
 include/dt-bindings/clock/imx8mn-clock.h   |  25 +-
 include/dt-bindings/power/imx8mn-power.h   |   5 +
 include/dt-bindings/sound/tlv320aic31xx.h  |  14 ++
 15 files changed, 607 insertions(+), 208 deletions(-)
 create mode 100644 include/dt-bindings/sound/tlv320aic31xx.h
arch/arm/dts/imx8mn-beacon-baseboard.dtsi +3 -1
index 376ca8ff721..02f37dcda7e 100644
@@ -126,7 +126,6 @@
 		compatible = "wlf,wm8962";
 		reg = <0x1a>;
 		clocks = <&clk IMX8MN_CLK_SAI3_ROOT>;
-		clock-names = "xclk";
 		DCVDD-supply = <&reg_audio>;
 		DBVDD-supply = <&reg_audio>;
 		AVDD-supply = <&reg_audio>;
@@ -176,6 +175,7 @@
 	pinctrl-0 = <&pinctrl_uart3>;
 	assigned-clocks = <&clk IMX8MN_CLK_UART3>;
 	assigned-clock-parents = <&clk IMX8MN_SYS_PLL1_80M>;
+	uart-has-rtscts;
 	status = "okay";
 };
 
@@ -259,6 +259,8 @@
 		fsl,pins = <
 			MX8MN_IOMUXC_ECSPI1_SCLK_UART3_DCE_RX	0x40
 			MX8MN_IOMUXC_ECSPI1_MOSI_UART3_DCE_TX	0x40
+			MX8MN_IOMUXC_ECSPI1_MISO_UART3_DCE_CTS_B	0x40
+			MX8MN_IOMUXC_ECSPI1_SS0_UART3_DCE_RTS_B	0x40
 		>;
 	};
 
arch/arm/dts/imx8mn-beacon-som.dtsi +9 -3
index de2cd0e3201..1133cded9be 100644
@@ -101,7 +101,7 @@
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		spi-max-frequency = <80000000>;
-		spi-tx-bus-width = <4>;
+		spi-tx-bus-width = <1>;
 		spi-rx-bus-width = <4>;
 	};
 };
@@ -120,6 +120,9 @@
 		interrupt-parent = <&gpio1>;
 		interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
 		rohm,reset-snvs-powered;
+		#clock-cells = <0>;
+		clocks = <&osc_32k 0>;
+		clock-output-names = "clk-32k-out";
 
 		regulators {
 			buck1_reg: BUCK1 {
@@ -262,12 +265,15 @@
 &usdhc1 {
 	#address-cells = <1>;
 	#size-cells = <0>;
-	pinctrl-names = "default";
+	pinctrl-names = "default", "state_100mhz", "state_200mhz";
 	pinctrl-0 = <&pinctrl_usdhc1>;
+	pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
+	pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
+	vmmc-supply = <&buck4_reg>;
+	vqmmc-supply = <&buck5_reg>;
 	bus-width = <4>;
 	non-removable;
 	cap-power-off-card;
-	pm-ignore-notify;
 	keep-power-in-suspend;
 	mmc-pwrseq = <&usdhc1_pwrseq>;
 	status = "okay";
arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi +58 -55

182 lines not on this page · raw message

arch/arm/dts/imx8mn-bsh-smm-s2pro.dts +90 -0

108 lines not on this page · raw message

arch/arm/dts/imx8mn-ddr4-evk.dts +4 -0
index 7dfee715a2c..d8ce217c601 100644
@@ -59,6 +59,10 @@
 		interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
 		rohm,reset-snvs-powered;
 
+		#clock-cells = <0>;
+		clocks = <&osc_32k 0>;
+		clock-output-names = "clk-32k-out";
+
 		regulators {
 			buck1_reg: BUCK1 {
 				regulator-name = "buck1";
arch/arm/dts/imx8mn-evk-u-boot.dtsi +2 -2
index 593cf06eb95..c0d26f1f50f 100644
@@ -9,11 +9,11 @@
 	u-boot,dm-spl;
 };
 
-&{/soc@0/bus@30800000/i2c@30a20000/pca9450@25} {
+&{/soc@0/bus@30800000/i2c@30a20000/pmic@25} {
 	u-boot,dm-spl;
 };
 
-&{/soc@0/bus@30800000/i2c@30a20000/pca9450@25/regulators} {
+&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} {
 	u-boot,dm-spl;
 };
 
arch/arm/dts/imx8mn-evk.dts +28 -28

116 lines not on this page · raw message

arch/arm/dts/imx8mn-evk.dtsi +121 -0

179 lines not on this page · raw message

arch/arm/dts/imx8mn-var-som.dtsi +8 -7
index f97209fbd8b..87b5e23c766 100644
@@ -70,12 +70,12 @@
 		pendown-gpio = <&gpio1 3 GPIO_ACTIVE_LOW>;
 
 		ti,x-min = /bits/ 16 <125>;
-		touchscreen-size-x = /bits/ 16 <4008>;
+		touchscreen-size-x = <4008>;
 		ti,y-min = /bits/ 16 <282>;
-		touchscreen-size-y = /bits/ 16 <3864>;
+		touchscreen-size-y = <3864>;
 		ti,x-plate-ohms = /bits/ 16 <180>;
-		touchscreen-max-pressure = /bits/ 16 <255>;
-		touchscreen-average-samples = /bits/ 16 <10>;
+		touchscreen-max-pressure = <255>;
+		touchscreen-average-samples = <10>;
 		ti,debounce-tol = /bits/ 16 <3>;
 		ti,debounce-rep = /bits/ 16 <1>;
 		ti,settle-delay-usec = /bits/ 16 <150>;
@@ -91,8 +91,6 @@
 	phy-mode = "rgmii";
 	phy-handle = <&ethphy>;
 	phy-supply = <&reg_eth_phy>;
-	phy-reset-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
-	phy-reset-duration = <10>;
 	fsl,magic-packet;
 	status = "okay";
 
@@ -103,6 +101,8 @@
 		ethphy: ethernet-phy@4 {
 			compatible = "ethernet-phy-ieee802.3-c22";
 			reg = <4>;
+			reset-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+			reset-assert-us = <10000>;
 		};
 	};
 };
@@ -260,7 +260,8 @@
 };
 
 &usbotg1 {
-	dr_mode = "peripheral";
+	dr_mode = "otg";
+	usb-role-switch;
 	status = "okay";
 };
 
arch/arm/dts/imx8mn-venice-gw7902.dts +61 -19

162 lines not on this page · raw message

arch/arm/dts/imx8mn.dtsi +179 -91

450 lines not on this page · raw message

board/freescale/imx8mn_evk/spl.c +1 -1
index 14cb51368f8..c0bfb67199a 100644
@@ -69,7 +69,7 @@ int power_init_board(void)
 	struct udevice *dev;
 	int ret;
 
-	ret = pmic_get("pca9450@25", &dev);
+	ret = pmic_get("pmic@25", &dev);
 	if (ret == -ENODEV) {
 		puts("No pca9450@25\n");
 		return 0;
include/dt-bindings/clock/imx8mn-clock.h +24 -1
index 621ea0e87c6..07b8a282c26 100644
@@ -234,6 +234,29 @@
 
 #define IMX8MN_CLK_A53_CORE			214
 
-#define IMX8MN_CLK_END				215
+#define IMX8MN_CLK_CLKOUT1_SEL			215
+#define IMX8MN_CLK_CLKOUT1_DIV			216
+#define IMX8MN_CLK_CLKOUT1			217
+#define IMX8MN_CLK_CLKOUT2_SEL			218
+#define IMX8MN_CLK_CLKOUT2_DIV			219
+#define IMX8MN_CLK_CLKOUT2			220
+
+#define IMX8MN_CLK_M7_CORE			221
+
+#define IMX8MN_CLK_GPT_3M			222
+#define IMX8MN_CLK_GPT1				223
+#define IMX8MN_CLK_GPT1_ROOT			224
+#define IMX8MN_CLK_GPT2				225
+#define IMX8MN_CLK_GPT2_ROOT			226
+#define IMX8MN_CLK_GPT3				227
+#define IMX8MN_CLK_GPT3_ROOT			228
+#define IMX8MN_CLK_GPT4				229
+#define IMX8MN_CLK_GPT4_ROOT			230
+#define IMX8MN_CLK_GPT5				231
+#define IMX8MN_CLK_GPT5_ROOT			232
+#define IMX8MN_CLK_GPT6				233
+#define IMX8MN_CLK_GPT6_ROOT			234
+
+#define IMX8MN_CLK_END				235
 
 #endif
include/dt-bindings/power/imx8mn-power.h +5 -0
index 102ee85a9b6..eedd0e58193 100644
@@ -12,4 +12,9 @@
 #define IMX8MN_POWER_DOMAIN_DISPMIX	3
 #define IMX8MN_POWER_DOMAIN_MIPI	4
 
+#define IMX8MN_DISPBLK_PD_MIPI_DSI	0
+#define IMX8MN_DISPBLK_PD_MIPI_CSI	1
+#define IMX8MN_DISPBLK_PD_LCDIF	2
+#define IMX8MN_DISPBLK_PD_ISI	3
+
 #endif
include/dt-bindings/sound/tlv320aic31xx.h new file +14 -0
new file mode 100644
index 00000000000..4a80238ab25
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __DT_TLV320AIC31XX_H
+#define __DT_TLV320AIC31XX_H
+
+#define MICBIAS_2_0V		1
+#define MICBIAS_2_5V		2
+#define MICBIAS_AVDDV		3
+
+#define PLL_CLKIN_MCLK		0x00
+#define PLL_CLKIN_BCLK		0x01
+#define PLL_CLKIN_GPIO1		0x02
+#define PLL_CLKIN_DIN		0x03
+
+#endif /* __DT_TLV320AIC31XX_H */
Signature · 1 line
2.35.1
#54 lore raw

PATCH 21/26 imx8mn: synchronise device tree with linux

Quoted 3 lines

From: Marcel Ziswiler <[email protected]> Synchronise device tree with linux v5.19-rc5.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#55 lore raw

Re: [PATCH v1 21/26] imx8mn: synchronise device tree with linux

In reply to Marcel Ziswiler
Quoted 6 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

For what it's worth to others who may have been impacted, this patch broke my nano booting because the imx8mn.dtsi now has the UART's as subnodes to spba1 which wasn't being included in SPL's device tree. It's likely to impact others who are booting with DM_SERIAL enabled on their Nano.

To fix, I had to add a small line of code to my imx8mn-beacon-kit-u-boot.dtsi file with the following:

&spba1 {
       u-boot,dm-spl;
};

With that, my board boots again. If anyone else is using DM_SERIAL and having issues no longer starting, give that a try.

Since there are few nano boards with common -u-boot.dtsi entries, it seems like it makes sense to have a common imx8mn-u-boot.dtsi file like we do for Mini and Plus. I'll try to work on that as I have time. (hopefully today)

adam

Quoted 20 lines

---

 arch/arm/dts/imx8mn-beacon-baseboard.dtsi  |   4 +-
 arch/arm/dts/imx8mn-beacon-som.dtsi        |  12 +-
 arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi | 113 ++++-----
 arch/arm/dts/imx8mn-bsh-smm-s2pro.dts      |  90 +++++++
 arch/arm/dts/imx8mn-ddr4-evk.dts           |   4 +
 arch/arm/dts/imx8mn-evk-u-boot.dtsi        |   4 +-
 arch/arm/dts/imx8mn-evk.dts                |  56 ++---
 arch/arm/dts/imx8mn-evk.dtsi               | 121 +++++++++
 arch/arm/dts/imx8mn-var-som.dtsi           |  15 +-
 arch/arm/dts/imx8mn-venice-gw7902.dts      |  80 ++++--
 arch/arm/dts/imx8mn.dtsi                   | 270 ++++++++++++++-------
 board/freescale/imx8mn_evk/spl.c           |   2 +-
 include/dt-bindings/clock/imx8mn-clock.h   |  25 +-
 include/dt-bindings/power/imx8mn-power.h   |   5 +
 include/dt-bindings/sound/tlv320aic31xx.h  |  14 ++
 15 files changed, 607 insertions(+), 208 deletions(-)
 create mode 100644 include/dt-bindings/sound/tlv320aic31xx.h

<snip>

Quoted 3 lines

--
2.35.1

#56 lore raw

Re: [PATCH v1 21/26] imx8mn: synchronise device tree with linux

Hi Adam

Quoted 6 lines · Adam Ford
Quoted 5 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

Quoted 7 lines
Quoted 1 line

For what it's worth to others who may have been impacted,  this patch broke my nano booting because the imx8mn.dtsi now has the UART's as subnodes to spba1 which wasn't being included in SPL's device tree. It's likely to impact others who are booting with DM_SERIAL enabled on their Nano.

Sorry about that.

Quoted 7 lines

To fix, I had to add a small line of code to my imx8mn-beacon-kit-u-boot.dtsi file with the following:

&spba1 {
       u-boot,dm-spl;
};

Quoted 7 lines

With that, my board boots again.  If anyone else is using DM_SERIAL and having issues no longer starting, give that a try.

Since there are few  nano boards with common -u-boot.dtsi entries, it seems like it makes sense to have a common imx8mn-u-boot.dtsi file like we do for Mini and Plus.  I'll try to work on that as I have time. (hopefully today)

Thanks for your help in correcting this.

Cheers

Marcel

#57 lore raw

Re: [PATCH v1 21/26] imx8mn: synchronise device tree with linux

Quoted 30 lines · Marcel Ziswiler

Hi Adam

Quoted 6 lines · Adam Ford
Quoted 5 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

Quoted 7 lines
Quoted 1 line

For what it's worth to others who may have been impacted, this patch broke my nano booting because the imx8mn.dtsi now has the UART's as subnodes to spba1 which wasn't being included in SPL's device tree. It's likely to impact others who are booting with DM_SERIAL enabled on their Nano.

Sorry about that.

Quoted 10 lines

To fix, I had to add a small line of code to my imx8mn-beacon-kit-u-boot.dtsi file with the following:

&spba1 {
       u-boot,dm-spl;
};

With that, my board boots again. If anyone else is using DM_SERIAL and having issues no longer starting, give that a try.

Quoted 6 lines
Quoted 4 lines

Since there are few nano boards with common -u-boot.dtsi entries, it seems like it makes sense to have a common imx8mn-u-boot.dtsi file like we do for Mini and Plus. I'll try to work on that as I have time. (hopefully today)

Thanks for your help in correcting this.

Marcel,

Have you seen the patch series I posted at [1]?
I know Tim Harvey replied 'tested-by' to the cover letter. Might you have a chance to test it?

[1] - https://patchwork.ozlabs.org/project/uboot/list/?series=312016

Quoted 4 lines

Cheers

Marcel

#58 lore raw

Re: [PATCH v1 21/26] imx8mn: synchronise device tree with linux

Hello Adam,

Quoted 34 lines · Adam Ford
Quoted 32 lines · Marcel Ziswiler
Quoted 6 lines · Adam Ford
Quoted 5 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

Quoted 7 lines
Quoted 1 line

For what it's worth to others who may have been impacted, this patch broke my nano booting because the imx8mn.dtsi now has the UART's as subnodes to spba1 which wasn't being included in SPL's device tree. It's likely to impact others who are booting with DM_SERIAL enabled on their Nano.

Sorry about that.

Quoted 14 lines

To fix, I had to add a small line of code to my imx8mn-beacon-kit-u-boot.dtsi file with the following:

&spba1 {
       u-boot,dm-spl;
};

With that, my board boots again. If anyone else is using DM_SERIAL and having issues no longer starting, give that a try.

Since there are few nano boards with common -u-boot.dtsi entries, it seems like it makes sense to have a common imx8mn-u-boot.dtsi file like we do for Mini and Plus. I'll try to work on that as I have time. (hopefully today)

Quoted 5 lines
Quoted 1 line

Thanks for your help in correcting this.

Have you seen the patch series I posted at [1]?
I know Tim Harvey replied 'tested-by' to the cover letter. Might you have a chance to test it?

There are no i.MX8M Nano Toradex products (as of today), no way to test unfortunately.

Francesco

#59 lore raw

PATCH 22/26 imx8mp: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

---

 arch/arm/dts/imx8mp-evk.dts           | 283 ++++++++++++++++++++++++--
 arch/arm/dts/imx8mp-phycore-som.dtsi  |  64 ++++--
 arch/arm/dts/imx8mp-venice-gw74xx.dts |  59 ++----
 arch/arm/dts/imx8mp.dtsi              | 261 ++++++++++++++++++++++--
 4 files changed, 566 insertions(+), 101 deletions(-)
arch/arm/dts/imx8mp-evk.dts +264 -19
index f846d69dac9..4c3ac4214a2 100644
@@ -74,11 +74,21 @@
 	status = "okay";
 };
 
+&flexcan2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_flexcan2>;
+	xceiver-supply = <&reg_can2_stby>;
+	status = "disabled";/* can2 pin conflict with pdm */
+};
+
 &eqos {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_eqos>;
 	phy-mode = "rgmii-id";
 	phy-handle = <&ethphy0>;
+	snps,force_thresh_dma_mode;
+	snps,mtl-tx-config = <&mtl_tx_setup>;
+	snps,mtl-rx-config = <&mtl_rx_setup>;
 	status = "okay";
 
 	mdio {
@@ -90,15 +100,77 @@
 			compatible = "ethernet-phy-ieee802.3-c22";
 			reg = <1>;
 			eee-broken-1000t;
+			reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
+			reset-assert-us = <10000>;
+			reset-deassert-us = <80000>;
+			realtek,clkout-disable;
 		};
 	};
-};
 
-&flexcan2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_flexcan2>;
-	xceiver-supply = <&reg_can2_stby>;
-	status = "disabled";/* can2 pin conflict with pdm */
+	mtl_tx_setup: tx-queues-config {
+		snps,tx-queues-to-use = <5>;
+		snps,tx-sched-sp;
+
+		queue0 {
+			snps,dcb-algorithm;
+			snps,priority = <0x1>;
+		};
+
+		queue1 {
+			snps,dcb-algorithm;
+			snps,priority = <0x2>;
+		};
+
+		queue2 {
+			snps,dcb-algorithm;
+			snps,priority = <0x4>;
+		};
+
+		queue3 {
+			snps,dcb-algorithm;
+			snps,priority = <0x8>;
+		};
+
+		queue4 {
+			snps,dcb-algorithm;
+			snps,priority = <0xf0>;
+		};
+	};
+
+	mtl_rx_setup: rx-queues-config {
+		snps,rx-queues-to-use = <5>;
+		snps,rx-sched-sp;
+
+		queue0 {
+			snps,dcb-algorithm;
+			snps,priority = <0x1>;
+			snps,map-to-dma-channel = <0>;
+		};
+
+		queue1 {
+			snps,dcb-algorithm;
+			snps,priority = <0x2>;
+			snps,map-to-dma-channel = <1>;
+		};
+
+		queue2 {
+			snps,dcb-algorithm;
+			snps,priority = <0x4>;
+			snps,map-to-dma-channel = <2>;
+		};
+
+		queue3 {
+			snps,dcb-algorithm;
+			snps,priority = <0x8>;
+			snps,map-to-dma-channel = <3>;
+		};
+
+		queue4 {
+			snps,dcb-algorithm;
+			snps,priority = <0xf0>;
+			snps,map-to-dma-channel = <4>;
+		};
+	};
 };
 
 &fec {
@@ -118,6 +190,95 @@
 			reg = <1>;
 			eee-broken-1000t;
 			reset-gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;
+			reset-assert-us = <10000>;
+			reset-deassert-us = <80000>;
+			realtek,clkout-disable;
+		};
+	};
+};
+
+&i2c1 {
+	clock-frequency = <400000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c1>;
+	status = "okay";
+
+	pmic@25 {
+		compatible = "nxp,pca9450c";
+		reg = <0x25>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_pmic>;
+		interrupt-parent = <&gpio1>;
+		interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
+
+		regulators {
+			BUCK1 {
+				regulator-name = "BUCK1";
+				regulator-min-microvolt = <720000>;
+				regulator-max-microvolt = <1000000>;
+				regulator-boot-on;
+				regulator-always-on;
+				regulator-ramp-delay = <3125>;
+			};
+
+			BUCK2 {
+				regulator-name = "BUCK2";
+				regulator-min-microvolt = <720000>;
+				regulator-max-microvolt = <1025000>;
+				regulator-boot-on;
+				regulator-always-on;
+				regulator-ramp-delay = <3125>;
+				nxp,dvs-run-voltage = <950000>;
+				nxp,dvs-standby-voltage = <850000>;
+			};
+
+			BUCK4 {
+				regulator-name = "BUCK4";
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3600000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			BUCK5 {
+				regulator-name = "BUCK5";
+				regulator-min-microvolt = <1650000>;
+				regulator-max-microvolt = <1950000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			BUCK6 {
+				regulator-name = "BUCK6";
+				regulator-min-microvolt = <1045000>;
+				regulator-max-microvolt = <1155000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			LDO1 {
+				regulator-name = "LDO1";
+				regulator-min-microvolt = <1650000>;
+				regulator-max-microvolt = <1950000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			LDO3 {
+				regulator-name = "LDO3";
+				regulator-min-microvolt = <1710000>;
+				regulator-max-microvolt = <1890000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			LDO5 {
+				regulator-name = "LDO5";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
 		};
 	};
 };
@@ -133,9 +294,46 @@
 		reg = <0x20>;
 		gpio-controller;
 		#gpio-cells = <2>;
+		interrupt-controller;
+		#interrupt-cells = <2>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_pca6416_int>;
+		interrupt-parent = <&gpio1>;
+		interrupts = <12 IRQ_TYPE_LEVEL_LOW>;
+		gpio-line-names = "EXT_PWREN1",
+			"EXT_PWREN2",
+			"CAN1/I2C5_SEL",
+			"PDM/CAN2_SEL",
+			"FAN_EN",
+			"PWR_MEAS_IO1",
+			"PWR_MEAS_IO2",
+			"EXP_P0_7",
+			"EXP_P1_0",
+			"EXP_P1_1",
+			"EXP_P1_2",
+			"EXP_P1_3",
+			"EXP_P1_4",
+			"EXP_P1_5",
+			"EXP_P1_6",
+			"EXP_P1_7";
 	};
 };
 
+/* I2C on expansion connector J22. */
+&i2c5 {
+	clock-frequency = <100000>; /* Lower clock speed for external bus. */
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c5>;
+	status = "disabled"; /* can1 pins conflict with i2c5 */
+
+	/* GPIO 2 of PCA6416 is used to switch between CAN1 and I2C5 functions:
+	 *     LOW:  CAN1 (default, pull-down)
+	 *     HIGH: I2C5
+	 * You need to set it to high to enable I2C5 (for example, add gpio-hog
+	 * in pca6416 node).
+	 */
+};
+
 &snvs_pwrkey {
 	status = "okay";
 };
@@ -147,6 +345,21 @@
 	status = "okay";
 };
 
+&usb3_phy1 {
+	status = "okay";
+};
+
+&usb3_1 {
+	status = "okay";
+};
+
+&usb_dwc3_1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usb1_vbus>;
+	dr_mode = "host";
+	status = "okay";
+};
+
 &usdhc2 {
 	assigned-clocks = <&clk IMX8MP_CLK_USDHC2>;
 	assigned-clock-rates = <400000000>;
@@ -182,21 +395,21 @@
 &iomuxc {
 	pinctrl_eqos: eqosgrp {
 		fsl,pins = <
-			MX8MP_IOMUXC_ENET_MDC__ENET_QOS_MDC	0x3
-			MX8MP_IOMUXC_ENET_MDIO__ENET_QOS_MDIO	0x3
-			MX8MP_IOMUXC_ENET_RD0__ENET_QOS_RGMII_RD0	0x91
-			MX8MP_IOMUXC_ENET_RD1__ENET_QOS_RGMII_RD1	0x91
-			MX8MP_IOMUXC_ENET_RD2__ENET_QOS_RGMII_RD2	0x91
-			MX8MP_IOMUXC_ENET_RD3__ENET_QOS_RGMII_RD3	0x91
+			MX8MP_IOMUXC_ENET_MDC__ENET_QOS_MDC				0x3
+			MX8MP_IOMUXC_ENET_MDIO__ENET_QOS_MDIO				0x3
+			MX8MP_IOMUXC_ENET_RD0__ENET_QOS_RGMII_RD0			0x91
+			MX8MP_IOMUXC_ENET_RD1__ENET_QOS_RGMII_RD1			0x91
+			MX8MP_IOMUXC_ENET_RD2__ENET_QOS_RGMII_RD2			0x91
+			MX8MP_IOMUXC_ENET_RD3__ENET_QOS_RGMII_RD3			0x91
 			MX8MP_IOMUXC_ENET_RXC__CCM_ENET_QOS_CLOCK_GENERATE_RX_CLK	0x91
-			MX8MP_IOMUXC_ENET_RX_CTL__ENET_QOS_RGMII_RX_CTL	0x91
-			MX8MP_IOMUXC_ENET_TD0__ENET_QOS_RGMII_TD0		0x1f
-			MX8MP_IOMUXC_ENET_TD1__ENET_QOS_RGMII_TD1		0x1f
-			MX8MP_IOMUXC_ENET_TD2__ENET_QOS_RGMII_TD2		0x1f
-			MX8MP_IOMUXC_ENET_TD3__ENET_QOS_RGMII_TD3		0x1f
-			MX8MP_IOMUXC_ENET_TX_CTL__ENET_QOS_RGMII_TX_CTL	0x1f
+			MX8MP_IOMUXC_ENET_RX_CTL__ENET_QOS_RGMII_RX_CTL			0x91
+			MX8MP_IOMUXC_ENET_TD0__ENET_QOS_RGMII_TD0			0x1f
+			MX8MP_IOMUXC_ENET_TD1__ENET_QOS_RGMII_TD1			0x1f
+			MX8MP_IOMUXC_ENET_TD2__ENET_QOS_RGMII_TD2			0x1f
+			MX8MP_IOMUXC_ENET_TD3__ENET_QOS_RGMII_TD3			0x1f
+			MX8MP_IOMUXC_ENET_TX_CTL__ENET_QOS_RGMII_TX_CTL			0x1f
 			MX8MP_IOMUXC_ENET_TXC__CCM_ENET_QOS_CLOCK_GENERATE_TX_CLK	0x1f
-			MX8MP_IOMUXC_SAI2_RXC__GPIO4_IO22		0x19
+			MX8MP_IOMUXC_SAI2_RXC__GPIO4_IO22				0x19
 		>;
 	};
 
@@ -252,6 +465,13 @@
 		>;
 	};
 
+	pinctrl_i2c1: i2c1grp {
+		fsl,pins = <
+			MX8MP_IOMUXC_I2C1_SCL__I2C1_SCL		0x400001c3
+			MX8MP_IOMUXC_I2C1_SDA__I2C1_SDA		0x400001c3
+		>;
+	};
+
 	pinctrl_i2c3: i2c3grp {
 		fsl,pins = <
 			MX8MP_IOMUXC_I2C3_SCL__I2C3_SCL		0x400001c3
@@ -259,6 +479,25 @@
 		>;
 	};
 
+	pinctrl_i2c5: i2c5grp {
+		fsl,pins = <
+			MX8MP_IOMUXC_SPDIF_RX__I2C5_SDA         0x400001c3
+			MX8MP_IOMUXC_SPDIF_TX__I2C5_SCL         0x400001c3
+		>;
+	};
+
+	pinctrl_pmic: pmicgrp {
+		fsl,pins = <
+			MX8MP_IOMUXC_GPIO1_IO03__GPIO1_IO03	0x000001c0
+		>;
+	};
+
+	pinctrl_pca6416_int: pca6416_int_grp {
+		fsl,pins = <
+			MX8MP_IOMUXC_GPIO1_IO12__GPIO1_IO12	0x146 /* Input pull-up. */
+		>;
+	};
+
 	pinctrl_reg_usdhc2_vmmc: regusdhc2vmmcgrp {
 		fsl,pins = <
 			MX8MP_IOMUXC_SD2_RESET_B__GPIO2_IO19	0x41
@@ -272,6 +511,12 @@
 		>;
 	};
 
+	pinctrl_usb1_vbus: usb1grp {
+		fsl,pins = <
+			MX8MP_IOMUXC_GPIO1_IO14__USB2_OTG_PWR	0x19
+		>;
+	};
+
 	pinctrl_usdhc2: usdhc2grp {
 		fsl,pins = <
 			MX8MP_IOMUXC_SD2_CLK__USDHC2_CLK	0x190
arch/arm/dts/imx8mp-phycore-som.dtsi +47 -17

121 lines not on this page · raw message

arch/arm/dts/imx8mp-venice-gw74xx.dts +16 -43

106 lines not on this page · raw message

arch/arm/dts/imx8mp.dtsi +239 -22

463 lines not on this page · raw message

Signature · 1 line
2.35.1
#60 lore raw

PATCH 22/26 imx8mp: synchronise device tree with linux

Quoted 3 lines

From: Marcel Ziswiler <[email protected]> Synchronise device tree with linux v5.19-rc5.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#61 lore raw

PATCH 23/26 imx8mp-rsb3720-a1: fix pwms property warnings

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Fix the following build-time pwms property warnings:

w+arch/arm/dts/imx8mp-rsb3720-a1.dtb: Warning (pwms_property):
/lvds_backlight@0:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx8mp-rsb3720-a1.dtb: Warning (pwms_property):
/lvds_backlight@1:pwms: property size (12) too small for cell size 3

---

 arch/arm/dts/imx8mp-rsb3720-a1.dts | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/dts/imx8mp-rsb3720-a1.dts +2 -0
index 1ef1c0c99ef..2d8dc196473 100644
@@ -143,12 +143,14 @@
 &pwm2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm2>;
+	#pwm-cells = <2>;
 	status = "okay";
 };
 
 &pwm3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm3>;
+	#pwm-cells = <2>;
 	status = "okay";
 };
 
Signature · 1 line
2.35.1
#62 lore raw

PATCH 23/26 imx8mp-rsb3720-a1: fix pwms property warnings

Quoted 7 lines

From: Marcel Ziswiler <[email protected]>
Fix the following build-time pwms property warnings:
w+arch/arm/dts/imx8mp-rsb3720-a1.dtb: Warning (pwms_property):
/lvds_backlight@0:pwms: property size (12) too small for cell size 3
w+arch/arm/dts/imx8mp-rsb3720-a1.dtb: Warning (pwms_property):
/lvds_backlight@1:pwms: property size (12) too small for cell size 3

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#63 lore raw

PATCH 24/26 verdin-imx8mp: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

Please note that this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device tree we are now using the regular one for the Verdin Development (carrier) board (e.g. imx8mp-verdin-wifi-dev.dtb rather than the previous imx8mp-verdin.dtb).

---

 arch/arm/dts/Makefile                         |    2 +-
 arch/arm/dts/imx8mp-verdin-dahlia.dtsi        |  129 ++
 arch/arm/dts/imx8mp-verdin-dev.dtsi           |   46 +
 ...tsi => imx8mp-verdin-wifi-dev-u-boot.dtsi} |   53 +-
 arch/arm/dts/imx8mp-verdin-wifi-dev.dts       |   18 +
 arch/arm/dts/imx8mp-verdin-wifi.dtsi          |   82 +
 arch/arm/dts/imx8mp-verdin.dts                |  639 --------
 arch/arm/dts/imx8mp-verdin.dtsi               | 1379 +++++++++++++++++
 board/toradex/verdin-imx8mp/MAINTAINERS       |    8 +-
 configs/verdin-imx8mp_defconfig               |    2 +-
 10 files changed, 1709 insertions(+), 649 deletions(-)
 create mode 100644 arch/arm/dts/imx8mp-verdin-dahlia.dtsi
 create mode 100644 arch/arm/dts/imx8mp-verdin-dev.dtsi
 rename arch/arm/dts/{imx8mp-verdin-u-boot.dtsi => imx8mp-verdin-wifi-dev-u-boot.dtsi} (66%)
 create mode 100644 arch/arm/dts/imx8mp-verdin-wifi-dev.dts
 create mode 100644 arch/arm/dts/imx8mp-verdin-wifi.dtsi
 delete mode 100644 arch/arm/dts/imx8mp-verdin.dts
 create mode 100644 arch/arm/dts/imx8mp-verdin.dtsi
arch/arm/dts/Makefile +1 -1
index 64f12419701..aa9f6b1540e 100644
@@ -966,7 +966,7 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
 	imx8mp-phyboard-pollux-rdk.dtb \
 	imx8mp-venice.dtb \
 	imx8mp-venice-gw74xx.dtb \
-	imx8mp-verdin.dtb \
+	imx8mp-verdin-wifi-dev.dtb \
 	imx8mq-pico-pi.dtb \
 	imx8mq-kontron-pitx-imx8m.dtb
 
arch/arm/dts/imx8mp-verdin-dahlia.dtsi new file +129 -0

129 lines not on this page · raw message

arch/arm/dts/imx8mp-verdin-dev.dtsi new file +46 -0

46 lines not on this page · raw message

arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi renamed from arch/arm/dts/imx8mp-verdin-u-boot.dtsi +47 -6

99 lines not on this page · raw message

arch/arm/dts/imx8mp-verdin-wifi-dev.dts new file +18 -0
new file mode 100644
index 00000000000..c1713c28cdc
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2022 Toradex
+ */
+
+/dts-v1/;
+
+#include "imx8mp-verdin.dtsi"
+#include "imx8mp-verdin-wifi.dtsi"
+#include "imx8mp-verdin-dev.dtsi"
+
+/ {
+	model = "Toradex Verdin iMX8M Plus WB on Verdin Development Board";
+	compatible = "toradex,verdin-imx8mp-wifi-dev",
+		     "toradex,verdin-imx8mp-wifi",
+		     "toradex,verdin-imx8mp",
+		     "fsl,imx8mp";
+};
arch/arm/dts/imx8mp-verdin-wifi.dtsi new file +82 -0

82 lines not on this page · raw message

arch/arm/dts/imx8mp-verdin.dts deleted +0 -639

639 lines not on this page · raw message

arch/arm/dts/imx8mp-verdin.dtsi new file +1379 -0

1,379 lines not on this page · raw message

board/toradex/verdin-imx8mp/MAINTAINERS +6 -2
index 5820546d1c5..cff3c503838 100644
@@ -1,6 +1,10 @@
 Verdin iMX8M Plus
-F:	arch/arm/dts/imx8mp-verdin.dts
-F:	arch/arm/dts/imx8mp-verdin-u-boot.dtsi
+F:	arch/arm/dts/imx8mp-verdin.dtsi
+F:	arch/arm/dts/imx8mp-verdin-dahlia.dtsi
+F:	arch/arm/dts/imx8mp-verdin-dev.dtsi
+F:	arch/arm/dts/imx8mp-verdin-wifi.dtsi
+F:	arch/arm/dts/imx8mp-verdin-wifi-dev.dts
+F:	arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi
 F:	board/toradex/verdin-imx8mp/
 F:	configs/verdin-imx8mp_defconfig
 F:	doc/board/toradex/verdin-imx8mp.rst
configs/verdin-imx8mp_defconfig +1 -1
index 52d281e8318..0804fbff915 100644
@@ -12,7 +12,7 @@ CONFIG_SYS_I2C_MXC_I2C2=y
 CONFIG_SYS_I2C_MXC_I2C3=y
 CONFIG_SYS_I2C_MXC_I2C4=y
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx8mp-verdin"
+CONFIG_DEFAULT_DEVICE_TREE="imx8mp-verdin-wifi-dev"
 CONFIG_SPL_TEXT_BASE=0x920000
 CONFIG_TARGET_VERDIN_IMX8MP=y
 CONFIG_SPL_MMC=y
Signature · 1 line
2.35.1
#64 lore raw

PATCH 24/26 verdin-imx8mp: synchronise device tree with linux

Quoted 7 lines

From: Marcel Ziswiler <[email protected]> Synchronise device tree with linux v5.19-rc5.
Please note that this also means that instead of the previous "generic" U-Boot specific carrier board agnostic device tree we are now using the regular one for the Verdin Development (carrier) board (e.g. imx8mp-verdin-wifi-dev.dtb rather than the previous imx8mp-verdin.dtb).

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#65 lore raw

PATCH 25/26 imx8mq: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

---

 arch/arm/dts/imx8mq-evk.dts                |  65 ++++++-
 arch/arm/dts/imx8mq-kontron-pitx-imx8m.dts |   3 +-
 arch/arm/dts/imx8mq-mnt-reform2.dts        | 144 ++++++++++++++-
 arch/arm/dts/imx8mq-nitrogen-som.dtsi      |  15 +-
 arch/arm/dts/imx8mq-phanbell.dts           |  86 +++++++--
 arch/arm/dts/imx8mq-pico-pi-u-boot.dtsi    |   2 +
 arch/arm/dts/imx8mq-pico-pi.dts            |  67 ++++---
 arch/arm/dts/imx8mq.dtsi                   | 204 +++++++++++++--------
 include/dt-bindings/clock/imx8mq-clock.h   |  19 --
 include/dt-bindings/power/imx8mq-power.h   |   3 +
 10 files changed, 452 insertions(+), 156 deletions(-)
arch/arm/dts/imx8mq-evk.dts +60 -5
index 85b045253a0..99fed35168e 100644
@@ -27,6 +27,17 @@
 		clock-frequency = <100000000>;
 	};
 
+	reg_pcie1: regulator-pcie {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_pcie1_reg>;
+		regulator-name = "MPCIE_3V3";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		gpio = <&gpio5 10 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
+
 	reg_usdhc2_vmmc: regulator-vsd-3v3 {
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_reg_usdhc2>;
@@ -123,6 +134,7 @@
 
 &ddrc {
 	operating-points-v2 = <&ddrc_opp_table>;
+	status = "okay";
 
 	ddrc_opp_table: opp-table {
 		compatible = "operating-points-v2";
@@ -169,6 +181,11 @@
 			reg = <0>;
 			reset-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
 			reset-assert-us = <10000>;
+			qca,disable-smarteee;
+			vddio-supply = <&vddh>;
+
+			vddh: vddh-regulator {
+			};
 		};
 	};
 };
@@ -318,6 +335,21 @@
 		 <&clk IMX8MQ_CLK_PCIE1_PHY>,
 		 <&pcie0_refclk>;
 	clock-names = "pcie", "pcie_aux", "pcie_phy", "pcie_bus";
+	vph-supply = <&vgen5_reg>;
+	status = "okay";
+};
+
+&pcie1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_pcie1>;
+	reset-gpio = <&gpio5 12 GPIO_ACTIVE_LOW>;
+	clocks = <&clk IMX8MQ_CLK_PCIE2_ROOT>,
+		 <&clk IMX8MQ_CLK_PCIE2_AUX>,
+		 <&clk IMX8MQ_CLK_PCIE2_PHY>,
+		 <&pcie0_refclk>;
+	clock-names = "pcie", "pcie_aux", "pcie_phy", "pcie_bus";
+	vpcie-supply = <&reg_pcie1>;
+	vph-supply = <&vgen5_reg>;
 	status = "okay";
 };
 
@@ -325,6 +357,10 @@
 	power-supply = <&sw1a_reg>;
 };
 
+&pgc_vpu {
+	power-supply = <&sw1c_reg>;
+};
+
 &qspi0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_qspi>;
@@ -336,6 +372,8 @@
 		#size-cells = <1>;
 		compatible = "micron,n25q256a", "jedec,spi-nor";
 		spi-max-frequency = <29000000>;
+		spi-tx-bus-width = <1>;
+		spi-rx-bus-width = <4>;
 	};
 };
 
@@ -402,9 +440,9 @@
 	assigned-clocks = <&clk IMX8MQ_CLK_USDHC2>;
 	assigned-clock-rates = <200000000>;
 	pinctrl-names = "default", "state_100mhz", "state_200mhz";
-	pinctrl-0 = <&pinctrl_usdhc2>;
-	pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
-	pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
+	pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
+	pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_gpio>;
+	pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
 	cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
 	vmmc-supply = <&reg_usdhc2_vmmc>;
 	status = "okay";
@@ -422,7 +460,6 @@
 		fsl,pins = <
 			MX8MQ_IOMUXC_GPIO1_IO13_GPIO1_IO13		0x19
 		>;
-
 	};
 
 	pinctrl_fec1: fec1grp {
@@ -471,6 +508,19 @@
 		>;
 	};
 
+	pinctrl_pcie1: pcie1grp {
+		fsl,pins = <
+			MX8MQ_IOMUXC_I2C4_SDA_PCIE2_CLKREQ_B		0x76
+			MX8MQ_IOMUXC_ECSPI2_MISO_GPIO5_IO12		0x16
+		>;
+	};
+
+	pinctrl_pcie1_reg: pcie1reggrp {
+		fsl,pins = <
+			MX8MQ_IOMUXC_ECSPI2_SCLK_GPIO5_IO10		0x16
+		>;
+	};
+
 	pinctrl_qspi: qspigrp {
 		fsl,pins = <
 			MX8MQ_IOMUXC_NAND_ALE_QSPI_A_SCLK	0x82
@@ -479,7 +529,6 @@
 			MX8MQ_IOMUXC_NAND_DATA01_QSPI_A_DATA1	0x82
 			MX8MQ_IOMUXC_NAND_DATA02_QSPI_A_DATA2	0x82
 			MX8MQ_IOMUXC_NAND_DATA03_QSPI_A_DATA3	0x82
-
 		>;
 	};
 
@@ -564,6 +613,12 @@
 		>;
 	};
 
+	pinctrl_usdhc2_gpio: usdhc2gpiogrp {
+		fsl,pins = <
+			MX8MQ_IOMUXC_SD2_CD_B_GPIO2_IO12		0x41
+		>;
+	};
+
 	pinctrl_usdhc2: usdhc2grp {
 		fsl,pins = <
 			MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK			0x83
arch/arm/dts/imx8mq-kontron-pitx-imx8m.dts +2 -1
index e8fbf0ec6d6..a91c136797f 100644
@@ -51,6 +51,7 @@
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
 		gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>;
+		off-on-delay-us = <20000>;
 		enable-active-high;
 	};
 };
@@ -310,7 +311,7 @@
 &uart3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart3>;
-	fsl,uart-has-rtscts;
+	uart-has-rtscts;
 	assigned-clocks = <&clk IMX8MQ_CLK_UART3>;
 	assigned-clock-parents = <&clk IMX8MQ_SYS1_PLL_80M>;
 	status = "okay";
arch/arm/dts/imx8mq-mnt-reform2.dts +142 -2

188 lines not on this page · raw message

arch/arm/dts/imx8mq-nitrogen-som.dtsi +9 -6
index 36fc428ebe3..395f77b5aca 100644
@@ -69,6 +69,9 @@
 			reg = <4>;
 			interrupt-parent = <&gpio1>;
 			interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+			reset-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+			reset-assert-us = <10000>;
+			reset-deassert-us = <300>;
 		};
 	};
 };
@@ -191,20 +194,20 @@
 			MX8MQ_IOMUXC_ENET_TD2_ENET1_RGMII_TD2		0x1f
 			MX8MQ_IOMUXC_ENET_TD3_ENET1_RGMII_TD3		0x1f
 			MX8MQ_IOMUXC_ENET_RX_CTL_ENET1_RGMII_RX_CTL	0x91
-			MX8MQ_IOMUXC_ENET_RXC_ENET1_RGMII_RXC		0x91
+			MX8MQ_IOMUXC_ENET_RXC_ENET1_RGMII_RXC		0xd1
 			MX8MQ_IOMUXC_ENET_RD0_ENET1_RGMII_RD0		0x91
 			MX8MQ_IOMUXC_ENET_RD1_ENET1_RGMII_RD1		0x91
 			MX8MQ_IOMUXC_ENET_RD2_ENET1_RGMII_RD2		0x91
-			MX8MQ_IOMUXC_ENET_RD3_ENET1_RGMII_RD3		0x91
-			MX8MQ_IOMUXC_GPIO1_IO09_GPIO1_IO9		0x19
-			MX8MQ_IOMUXC_GPIO1_IO11_GPIO1_IO11		0x59
+			MX8MQ_IOMUXC_ENET_RD3_ENET1_RGMII_RD3		0xd1
+			MX8MQ_IOMUXC_GPIO1_IO09_GPIO1_IO9		0x1
+			MX8MQ_IOMUXC_GPIO1_IO11_GPIO1_IO11		0x41
 		>;
 	};
 
 	pinctrl_i2c1: i2c1grp {
 		fsl,pins = <
-			MX8MQ_IOMUXC_I2C1_SCL_I2C1_SCL			0x4000007f
-			MX8MQ_IOMUXC_I2C1_SDA_I2C1_SDA			0x4000007f
+			MX8MQ_IOMUXC_I2C1_SCL_I2C1_SCL			0x40000022
+			MX8MQ_IOMUXC_I2C1_SDA_I2C1_SDA			0x40000022
 		>;
 	};
 
arch/arm/dts/imx8mq-phanbell.dts +75 -11

168 lines not on this page · raw message

arch/arm/dts/imx8mq-pico-pi-u-boot.dtsi +2 -0
index 9537aedf29e..7efd82214dd 100644
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: (GPL-2.0 OR MIT)
 
+#include "imx8mq-u-boot.dtsi"
+
 &pinctrl_uart1 {
 	u-boot,dm-spl;
 };
arch/arm/dts/imx8mq-pico-pi.dts +32 -35

149 lines not on this page · raw message

arch/arm/dts/imx8mq.dtsi +127 -77

313 lines not on this page · raw message

include/dt-bindings/clock/imx8mq-clock.h +0 -19
index 82e907ce7bd..afa74d7ba10 100644
@@ -405,25 +405,6 @@
 
 #define IMX8MQ_VIDEO2_PLL1_REF_SEL		266
 
-#define IMX8MQ_SYS1_PLL_40M_CG			267
-#define IMX8MQ_SYS1_PLL_80M_CG			268
-#define IMX8MQ_SYS1_PLL_100M_CG			269
-#define IMX8MQ_SYS1_PLL_133M_CG			270
-#define IMX8MQ_SYS1_PLL_160M_CG			271
-#define IMX8MQ_SYS1_PLL_200M_CG			272
-#define IMX8MQ_SYS1_PLL_266M_CG			273
-#define IMX8MQ_SYS1_PLL_400M_CG			274
-#define IMX8MQ_SYS1_PLL_800M_CG			275
-#define IMX8MQ_SYS2_PLL_50M_CG			276
-#define IMX8MQ_SYS2_PLL_100M_CG			277
-#define IMX8MQ_SYS2_PLL_125M_CG			278
-#define IMX8MQ_SYS2_PLL_166M_CG			279
-#define IMX8MQ_SYS2_PLL_200M_CG			280
-#define IMX8MQ_SYS2_PLL_250M_CG			281
-#define IMX8MQ_SYS2_PLL_333M_CG			282
-#define IMX8MQ_SYS2_PLL_500M_CG			283
-#define IMX8MQ_SYS2_PLL_1000M_CG		284
-
 #define IMX8MQ_CLK_GPU_CORE			285
 #define IMX8MQ_CLK_GPU_SHADER			286
 #define IMX8MQ_CLK_M4_CORE			287
include/dt-bindings/power/imx8mq-power.h +3 -0
index 8a513bd9166..9f7d0f1e7c3 100755
@@ -18,4 +18,7 @@
 #define IMX8M_POWER_DOMAIN_MIPI_CSI2	9
 #define IMX8M_POWER_DOMAIN_PCIE2	10
 
+#define IMX8MQ_VPUBLK_PD_G1		0
+#define IMX8MQ_VPUBLK_PD_G2		1
+
 #endif
Signature · 1 line
2.35.1
#66 lore raw

PATCH 25/26 imx8mq: synchronise device tree with linux

Quoted 3 lines

From: Marcel Ziswiler <[email protected]> Synchronise device tree with linux v5.19-rc5.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#67 lore raw

Re: [PATCH v1 25/26] imx8mq: synchronise device tree with linux

In reply to Marcel Ziswiler

Hi Marcel and all,

Am Do., 21. Juli 2022 um 15:48 Uhr schrieb Marcel Ziswiler <[email protected]>:

Quoted 9 lines

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

---

 arch/arm/dts/imx8mq-evk.dts                |  65 ++++++-

I just tried the current master on imx8mq-evk and figured out that it doesn't start. I did a git bisect and saw that the dtb sync seems to be responsible for that. Can anyone else confirm that?

Quoted 147 lines
 arch/arm/dts/imx8mq-kontron-pitx-imx8m.dts |   3 +-
 arch/arm/dts/imx8mq-mnt-reform2.dts        | 144 ++++++++++++++-
 arch/arm/dts/imx8mq-nitrogen-som.dtsi      |  15 +-
 arch/arm/dts/imx8mq-phanbell.dts           |  86 +++++++--
 arch/arm/dts/imx8mq-pico-pi-u-boot.dtsi    |   2 +
 arch/arm/dts/imx8mq-pico-pi.dts            |  67 ++++---
 arch/arm/dts/imx8mq.dtsi                   | 204 +++++++++++++--------
 include/dt-bindings/clock/imx8mq-clock.h   |  19 --
 include/dt-bindings/power/imx8mq-power.h   |   3 +
 10 files changed, 452 insertions(+), 156 deletions(-)
arch/arm/dts/imx8mq-evk.dts +54 -5
index 85b045253a0..99fed35168e 100644
@@ -27,6 +27,17 @@
                clock-frequency = <100000000>;
        };
 
+       reg_pcie1: regulator-pcie {
+               compatible = "regulator-fixed";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_pcie1_reg>;
+               regulator-name = "MPCIE_3V3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpio5 10 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+
        reg_usdhc2_vmmc: regulator-vsd-3v3 {
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_reg_usdhc2>;
@@ -123,6 +134,7 @@
 
 &ddrc {
        operating-points-v2 = <&ddrc_opp_table>;
+       status = "okay";
 
        ddrc_opp_table: opp-table {
                compatible = "operating-points-v2";
@@ -169,6 +181,11 @@
                        reg = <0>;
                        reset-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
                        reset-assert-us = <10000>;
+                       qca,disable-smarteee;
+                       vddio-supply = <&vddh>;
+
+                       vddh: vddh-regulator {
+                       };
                };
        };
 };
@@ -318,6 +335,21 @@
                 <&clk IMX8MQ_CLK_PCIE1_PHY>,
                 <&pcie0_refclk>;
        clock-names = "pcie", "pcie_aux", "pcie_phy", "pcie_bus";
+       vph-supply = <&vgen5_reg>;
+       status = "okay";
+};
+
+&pcie1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pcie1>;
+       reset-gpio = <&gpio5 12 GPIO_ACTIVE_LOW>;
+       clocks = <&clk IMX8MQ_CLK_PCIE2_ROOT>,
+                <&clk IMX8MQ_CLK_PCIE2_AUX>,
+                <&clk IMX8MQ_CLK_PCIE2_PHY>,
+                <&pcie0_refclk>;
+       clock-names = "pcie", "pcie_aux", "pcie_phy", "pcie_bus";
+       vpcie-supply = <&reg_pcie1>;
+       vph-supply = <&vgen5_reg>;
        status = "okay";
 };
 
@@ -325,6 +357,10 @@
        power-supply = <&sw1a_reg>;
 };
 
+&pgc_vpu {
+       power-supply = <&sw1c_reg>;
+};
+
 &qspi0 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_qspi>;
@@ -336,6 +372,8 @@
                #size-cells = <1>;
                compatible = "micron,n25q256a", "jedec,spi-nor";
                spi-max-frequency = <29000000>;
+               spi-tx-bus-width = <1>;
+               spi-rx-bus-width = <4>;
        };
 };
 
@@ -402,9 +440,9 @@
        assigned-clocks = <&clk IMX8MQ_CLK_USDHC2>;
        assigned-clock-rates = <200000000>;
        pinctrl-names = "default", "state_100mhz", "state_200mhz";
-       pinctrl-0 = <&pinctrl_usdhc2>;
-       pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
-       pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
+       pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
+       pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_gpio>;
+       pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
        cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
        vmmc-supply = <&reg_usdhc2_vmmc>;
        status = "okay";
@@ -422,7 +460,6 @@
                fsl,pins = <
                        MX8MQ_IOMUXC_GPIO1_IO13_GPIO1_IO13              0x19
                >;
-
        };
 
        pinctrl_fec1: fec1grp {
@@ -471,6 +508,19 @@
                >;
        };
 
+       pinctrl_pcie1: pcie1grp {
+               fsl,pins = <
+                       MX8MQ_IOMUXC_I2C4_SDA_PCIE2_CLKREQ_B            0x76
+                       MX8MQ_IOMUXC_ECSPI2_MISO_GPIO5_IO12             0x16
+               >;
+       };
+
+       pinctrl_pcie1_reg: pcie1reggrp {
+               fsl,pins = <
+                       MX8MQ_IOMUXC_ECSPI2_SCLK_GPIO5_IO10             0x16
+               >;
+       };
+
        pinctrl_qspi: qspigrp {
                fsl,pins = <
                        MX8MQ_IOMUXC_NAND_ALE_QSPI_A_SCLK       0x82
@@ -479,7 +529,6 @@
                        MX8MQ_IOMUXC_NAND_DATA01_QSPI_A_DATA1   0x82
                        MX8MQ_IOMUXC_NAND_DATA02_QSPI_A_DATA2   0x82
                        MX8MQ_IOMUXC_NAND_DATA03_QSPI_A_DATA3   0x82
-
                >;
        };
 
@@ -564,6 +613,12 @@
                >;
        };

arch/arm/dts/imx8mq-evk.dts line 624

Quoted 10 lines
arch/arm/dts/imx8mq-evk.dts +6 -0
 
+       pinctrl_usdhc2_gpio: usdhc2gpiogrp {
+               fsl,pins = <
+                       MX8MQ_IOMUXC_SD2_CD_B_GPIO2_IO12                0x41
+               >;
+       };
+
        pinctrl_usdhc2: usdhc2grp {
                fsl,pins = <
                        MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK                 0x83

[SNIP]

--
Heiko

#68 lore raw

Re: [PATCH v1 25/26] imx8mq: synchronise device tree with linux

Hi Heiko

Quoted 10 lines · Heiko Thiery

Hi Marcel and all,

Am Do., 21. Juli 2022 um 15:48 Uhr schrieb Marcel Ziswiler <[email protected]>:

Quoted 5 lines

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

Quoted 8 lines
Quoted 4 lines

---

 arch/arm/dts/imx8mq-evk.dts                |  65 ++++++-

I just tried the current master on imx8mq-evk and figured out that it doesn't start. I did a git bisect and saw that the dtb sync seems to be responsible for that. Can anyone else confirm that?

Remember, that series went in a little pre-maturely. Meanwhile, I posted a resp two refreshs [1] [2]. Would that maybe fix it? Otherwise, I guess somebody with that actual hardware would need figuring out what may go wrong resp. requires further patching the U-Boot specific device tree.

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/

[snip]

Cheers

Marcel

#69 lore raw

Re: [PATCH v1 25/26] imx8mq: synchronise device tree with linux

Hi Marcel,

Am Di., 6. Sept. 2022 um 16:05 Uhr schrieb Marcel Ziswiler <[email protected]>:

Quoted 19 lines

Hi Heiko

Quoted 15 lines · Heiko Thiery

Hi Marcel and all,

Am Do., 21. Juli 2022 um 15:48 Uhr schrieb Marcel Ziswiler <[email protected]>:

Quoted 9 lines

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v5.19-rc5.

---

 arch/arm/dts/imx8mq-evk.dts                |  65 ++++++-
Quoted 9 lines
Quoted 3 lines

I just tried the current master on imx8mq-evk and figured out that it doesn't start. I did a git bisect and saw that the dtb sync seems to be responsible for that. Can anyone else confirm that?

Remember, that series went in a little pre-maturely. Meanwhile, I posted a resp two refreshs [1] [2]. Would that maybe fix it? Otherwise, I guess somebody with that actual hardware would need figuring out what may go wrong resp. requires further patching the U-Boot specific device tree.

No I was not aware of that .. But meanwhile I figured out that when removing the node "hdmi_phy_27m" the board starts again.

Quoted 8 lines

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/

[snip]

Cheers

Marcel

Signature · 1 line
Heiko
#70 lore raw

PATCH 26/26 board: toradex: apalis-imx8: fix file names in maintainers

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Fix device tree file names in MAINTAINERS file.

Fixes 3d6036650059 ("board: toradex: add apalis imx8qm 4gb wb it v1.0b module support")

---

 board/toradex/apalis-imx8/MAINTAINERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
board/toradex/apalis-imx8/MAINTAINERS +2 -2
index 507172c5962..03b0fda0e17 100644
@@ -2,8 +2,8 @@ Apalis iMX8
 M:	Marcel Ziswiler <[email protected]>
 W:	http://developer.toradex.com/software/linux/linux-software
 S:	Maintained
-F:	arch/arm/dts/fsl-imx8-apalis.dts
-F:	arch/arm/dts/fsl-imx8-apalis-u-boot.dtsi
+F:	arch/arm/dts/fsl-imx8qm-apalis.dts
+F:	arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
 F:	board/toradex/apalis-imx8/
 F:	configs/apalis-imx8_defconfig
 F:	doc/board/toradex/apalis-imx8.rst
Signature · 1 line
2.35.1
#71 lore raw

PATCH 26/26 board: toradex: apalis-imx8: fix file names in maintainers

Quoted 4 lines

From: Marcel Ziswiler <[email protected]> Fix device tree file names in MAINTAINERS file.

Fixes 3d6036650059 ("board: toradex: add apalis imx8qm 4gb wb it v1.0b module support")

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================