* [PATCH v2 0/6] dm: Move to new driver model schema for device tree tags
@ 2023-01-29 1:26 Simon Glass
2023-01-29 1:26 ` [PATCH v2 1/6] schemas: Add schema for U-Boot driver model 'phase tags' Simon Glass
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Simon Glass @ 2023-01-29 1:26 UTC (permalink / raw)
To: U-Boot Mailing List
Cc: Tom Rini, U-Boot Custodians, Simon Glass, Marek Vasut, Pavel Herrmann
Now that a new schema has been accepted upstream, press it into service in
U-Boot.
Changes in v2:
- Add binding document
- Convert k3-am68-sk boards also
Simon Glass (6):
schemas: Add schema for U-Boot driver model 'phase tags'
dm: dts: Convert driver model tags to use new schema
dm: doc: Update device tree binding docs for new schema
dm: doc: Update documentation for new driver model schema
dm: doc: Move to new driver model schema
dm: treewide: Complete migration to new driver model schema
arch/arc/dts/abilis_tb100.dts | 2 +-
arch/arc/dts/axc001.dtsi | 2 +-
arch/arc/dts/axc003.dtsi | 2 +-
arch/arc/dts/axs10x_mb.dtsi | 6 +-
arch/arc/dts/emsdp.dts | 2 +-
arch/arc/dts/hsdk-common.dtsi | 2 +-
arch/arc/dts/iot_devkit.dts | 2 +-
arch/arc/dts/nsim.dts | 2 +-
arch/arc/dts/skeleton.dtsi | 2 +-
arch/arm/dts/am335x-brppt1-mmc-u-boot.dtsi | 48 +++++-----
arch/arm/dts/am335x-brsmarc1.dts | 28 +++---
arch/arm/dts/am335x-brxre1.dts | 22 ++---
arch/arm/dts/am335x-evm-u-boot.dtsi | 22 ++---
arch/arm/dts/am335x-evmsk-u-boot.dtsi | 4 +-
arch/arm/dts/am335x-guardian-u-boot.dtsi | 28 +++---
arch/arm/dts/am335x-pdu001-u-boot.dtsi | 30 +++----
arch/arm/dts/am335x-pxm50-u-boot.dtsi | 4 +-
arch/arm/dts/am335x-regor-rdk-u-boot.dtsi | 8 +-
arch/arm/dts/am335x-rut-u-boot.dtsi | 4 +-
.../dts/am335x-sancloud-bbe-lite-u-boot.dtsi | 18 ++--
arch/arm/dts/am335x-shc-u-boot.dtsi | 20 ++---
arch/arm/dts/am335x-wega-rdk-u-boot.dtsi | 14 +--
arch/arm/dts/am33xx-u-boot.dtsi | 2 +-
arch/arm/dts/am3517-evm-u-boot.dtsi | 18 ++--
arch/arm/dts/am4372-generic-u-boot.dtsi | 4 +-
arch/arm/dts/am4372-u-boot.dtsi | 20 ++---
arch/arm/dts/am437x-gp-evm-u-boot.dtsi | 24 ++---
arch/arm/dts/am437x-idk-evm-u-boot.dtsi | 8 +-
arch/arm/dts/am437x-sk-evm-u-boot.dtsi | 8 +-
arch/arm/dts/armada-3720-eDPU-u-boot.dtsi | 6 +-
arch/arm/dts/armada-3720-uDPU-u-boot.dtsi | 6 +-
arch/arm/dts/armada-385-atl-x530-u-boot.dtsi | 2 +-
.../dts/armada-385-turris-omnia-u-boot.dtsi | 12 +--
arch/arm/dts/armada-388-clearfog-u-boot.dtsi | 18 ++--
arch/arm/dts/armada-388-helios4-u-boot.dtsi | 20 ++---
.../armada-38x-controlcenterdc-u-boot.dtsi | 12 +--
arch/arm/dts/armada-ap80x-quad.dtsi | 8 +-
.../arm/dts/armada-xp-theadorable-u-boot.dtsi | 2 +-
arch/arm/dts/ast2500-evb.dts | 8 +-
arch/arm/dts/ast2500-u-boot.dtsi | 8 +-
arch/arm/dts/ast2600-evb.dts | 6 +-
arch/arm/dts/ast2600-u-boot.dtsi | 10 +--
.../dts/at91-sam9x60_curiosity-u-boot.dtsi | 34 +++----
arch/arm/dts/at91-sama5d27_giantboard.dts | 16 ++--
arch/arm/dts/at91-sama5d27_som1_ek.dts | 24 ++---
.../dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi | 20 ++---
arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi | 18 ++--
arch/arm/dts/at91-sama5d2_ptc_ek.dts | 18 ++--
arch/arm/dts/at91-sama5d2_xplained.dts | 38 ++++----
arch/arm/dts/at91-sama5d3_xplained.dts | 14 +--
arch/arm/dts/at91-sama5d4_xplained.dts | 20 ++---
arch/arm/dts/at91-sama5d4ek.dts | 20 ++---
arch/arm/dts/at91-sama7g5ek-u-boot.dtsi | 24 ++---
arch/arm/dts/at91sam9260-smartweb.dts | 4 +-
arch/arm/dts/at91sam9260.dtsi | 26 +++---
arch/arm/dts/at91sam9260ek.dts | 4 +-
arch/arm/dts/at91sam9261.dtsi | 26 +++---
arch/arm/dts/at91sam9263.dtsi | 26 +++---
arch/arm/dts/at91sam9263ek.dts | 4 +-
arch/arm/dts/at91sam9g15ek.dts | 2 +-
arch/arm/dts/at91sam9g20-taurus.dts | 6 +-
arch/arm/dts/at91sam9g20ek_common.dtsi | 4 +-
...1sam9g25-gardena-smart-gateway-u-boot.dtsi | 2 +-
arch/arm/dts/at91sam9g35ek.dts | 2 +-
arch/arm/dts/at91sam9g45-corvus.dts | 4 +-
arch/arm/dts/at91sam9g45-gurnard.dts | 4 +-
arch/arm/dts/at91sam9g45.dtsi | 12 +--
arch/arm/dts/at91sam9m10g45ek.dts | 4 +-
arch/arm/dts/at91sam9n12.dtsi | 26 +++---
arch/arm/dts/at91sam9n12ek.dts | 4 +-
arch/arm/dts/at91sam9rl.dtsi | 30 +++----
arch/arm/dts/at91sam9rlek.dts | 4 +-
arch/arm/dts/at91sam9x35ek.dts | 2 +-
arch/arm/dts/at91sam9x5.dtsi | 14 +--
arch/arm/dts/at91sam9x5dm.dtsi | 4 +-
arch/arm/dts/at91sam9x5ek.dtsi | 4 +-
arch/arm/dts/bcm283x-u-boot.dtsi | 10 +--
arch/arm/dts/bcm63158.dtsi | 4 +-
arch/arm/dts/bcm6855.dtsi | 4 +-
arch/arm/dts/bcm6856.dtsi | 4 +-
arch/arm/dts/bcm6858.dtsi | 4 +-
arch/arm/dts/bcm96753ref.dts | 2 +-
arch/arm/dts/bcm968360bg.dts | 2 +-
arch/arm/dts/bcm968580xref.dts | 2 +-
arch/arm/dts/bitmain-antminer-s9.dts | 4 +-
arch/arm/dts/ca-presidio-engboard.dts | 2 +-
arch/arm/dts/da850-evm-u-boot.dtsi | 12 +--
arch/arm/dts/da850-lcdk-u-boot.dtsi | 8 +-
arch/arm/dts/dm8168-evm-u-boot.dtsi | 2 +-
arch/arm/dts/dra7-evm-u-boot.dtsi | 18 ++--
arch/arm/dts/dra7-ipu-common-early-boot.dtsi | 40 ++++-----
arch/arm/dts/dra71-evm-u-boot.dtsi | 20 ++---
arch/arm/dts/dra72-evm-revc-u-boot.dtsi | 20 ++---
arch/arm/dts/dra72-evm-u-boot.dtsi | 8 +-
arch/arm/dts/dra76-evm-u-boot.dtsi | 14 +--
arch/arm/dts/dragonboard410c-uboot.dtsi | 12 +--
arch/arm/dts/dragonboard820c-uboot.dtsi | 12 +--
arch/arm/dts/dragonboard845c-uboot.dtsi | 8 +-
arch/arm/dts/exynos5.dtsi | 4 +-
arch/arm/dts/exynos5422-odroidxu3.dts | 2 +-
arch/arm/dts/exynos7420.dtsi | 14 +--
arch/arm/dts/exynos78x0.dtsi | 6 +-
arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi | 66 +++++++-------
arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi | 76 ++++++++--------
arch/arm/dts/fsl-imx8qxp-ai_ml-u-boot.dtsi | 56 ++++++------
arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi | 62 ++++++-------
arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 76 ++++++++--------
arch/arm/dts/fsl-imx8qxp-mek.dts | 2 +-
.../dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi | 18 ++--
arch/arm/dts/fsl-ls1088a-qds.dtsi | 2 +-
arch/arm/dts/fsl-ls1088a-rdb.dts | 2 +-
arch/arm/dts/fsl-ls2088a-rdb-qspi.dts | 2 +-
arch/arm/dts/fsl-lx2160a-qds.dtsi | 2 +-
arch/arm/dts/fsl-lx2160a-rdb.dts | 2 +-
arch/arm/dts/hi3660-hikey960-u-boot.dtsi | 2 +-
arch/arm/dts/hi6220-hikey-u-boot.dtsi | 4 +-
arch/arm/dts/hpe-gxp-u-boot.dtsi | 4 +-
arch/arm/dts/imx28-xea-u-boot.dtsi | 16 ++--
arch/arm/dts/imx53-m53menlo-u-boot.dtsi | 18 ++--
arch/arm/dts/imx53-ppd-uboot.dtsi | 10 +--
arch/arm/dts/imx6dl-brppt2.dts | 18 ++--
.../dts/imx6dl-colibri-eval-v3-u-boot.dtsi | 2 +-
arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi | 2 +-
arch/arm/dts/imx6dl-mamoj-u-boot.dtsi | 4 +-
arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi | 2 +-
arch/arm/dts/imx6q-bosch-acc-u-boot.dtsi | 32 +++----
arch/arm/dts/imx6q-display5-u-boot.dtsi | 6 +-
arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi | 2 +-
arch/arm/dts/imx6q-kp-u-boot.dtsi | 22 ++---
arch/arm/dts/imx6q-logicpd-u-boot.dtsi | 12 +--
.../imx6q-phytec-mira-rdk-nand-u-boot.dtsi | 18 ++--
arch/arm/dts/imx6q-tbs2910-u-boot.dtsi | 8 +-
.../arm/dts/imx6qdl-aristainetos2-u-boot.dtsi | 22 ++---
.../dts/imx6qdl-aristainetos2c-u-boot.dtsi | 22 ++---
.../imx6qdl-aristainetos2c_cslb-u-boot.dtsi | 22 ++---
...qdl-hummingboard2-emmc-som-v15-u-boot.dtsi | 20 ++---
arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi | 8 +-
arch/arm/dts/imx6qdl-icore-u-boot.dtsi | 6 +-
arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi | 4 +-
arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi | 4 +-
arch/arm/dts/imx6qdl-u-boot.dtsi | 16 ++--
arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi | 10 +--
arch/arm/dts/imx6ul-geam-u-boot.dtsi | 8 +-
arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi | 2 +-
arch/arm/dts/imx6ul-isiot-u-boot.dtsi | 6 +-
arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi | 10 +--
arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi | 10 +--
arch/arm/dts/imx6ul-u-boot.dtsi | 12 +--
.../dts/imx6ull-colibri-eval-v3-u-boot.dtsi | 10 +--
arch/arm/dts/imx6ull-dart-6ul.dtsi | 10 +--
arch/arm/dts/imx6ull-mys-6ulx-u-boot.dtsi | 14 +--
.../dts/imx6ull-seeed-npi-imx6ull-u-boot.dtsi | 14 +--
arch/arm/dts/imx6ull-u-boot.dtsi | 14 +--
arch/arm/dts/imx6ulz-bsh-smm-m2-u-boot.dtsi | 16 ++--
arch/arm/dts/imx7-cm-u-boot.dtsi | 6 +-
.../arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi | 2 +-
arch/arm/dts/imx7d-pico-pi-u-boot.dtsi | 2 +-
arch/arm/dts/imx7s-warp-u-boot.dtsi | 8 +-
arch/arm/dts/imx7ulp-com-u-boot.dtsi | 16 ++--
arch/arm/dts/imx7ulp-uboot.dtsi | 18 ++--
arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi | 48 +++++-----
.../dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi | 42 ++++-----
arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi | 44 ++++-----
.../dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi | 44 ++++-----
arch/arm/dts/imx8mm-evk-u-boot.dtsi | 60 ++++++-------
.../imx8mm-icore-mx8mm-ctouch2-u-boot.dtsi | 12 +--
.../imx8mm-icore-mx8mm-edimm2.2-u-boot.dtsi | 12 +--
arch/arm/dts/imx8mm-icore-mx8mm-u-boot.dtsi | 10 +--
.../dts/imx8mm-kontron-bl-common-u-boot.dtsi | 60 ++++++-------
arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi | 10 +--
arch/arm/dts/imx8mm-u-boot.dtsi | 30 +++----
arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi | 6 +-
arch/arm/dts/imx8mm-venice-gw7901-u-boot.dtsi | 8 +-
arch/arm/dts/imx8mm-venice-gw7902-u-boot.dtsi | 8 +-
arch/arm/dts/imx8mm-venice-gw7903-u-boot.dtsi | 8 +-
arch/arm/dts/imx8mm-venice-gw7904-u-boot.dtsi | 8 +-
arch/arm/dts/imx8mm-venice-u-boot.dtsi | 34 +++----
.../dts/imx8mm-verdin-wifi-dev-u-boot.dtsi | 40 ++++-----
arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi | 32 +++----
.../dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi | 24 ++---
arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi | 4 +-
arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi | 4 +-
arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 38 ++++----
arch/arm/dts/imx8mn-evk-u-boot.dtsi | 10 +--
arch/arm/dts/imx8mn-u-boot.dtsi | 30 +++----
.../dts/imx8mn-var-som-symphony-u-boot.dtsi | 32 +++----
arch/arm/dts/imx8mn-venice-gw7902-u-boot.dtsi | 8 +-
arch/arm/dts/imx8mn-venice-u-boot.dtsi | 30 +++----
arch/arm/dts/imx8mp-dhcom-u-boot.dtsi | 54 +++++------
arch/arm/dts/imx8mp-evk-u-boot.dtsi | 54 +++++------
.../imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi | 52 +++++------
arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi | 26 +++---
.../imx8mp-phyboard-pollux-rdk-u-boot.dtsi | 36 ++++----
arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi | 56 ++++++------
arch/arm/dts/imx8mp-u-boot.dtsi | 26 +++---
arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi | 28 +++---
arch/arm/dts/imx8mp-venice-u-boot.dtsi | 34 +++----
.../dts/imx8mp-verdin-wifi-dev-u-boot.dtsi | 56 ++++++------
arch/arm/dts/imx8mq-cm-u-boot.dtsi | 4 +-
arch/arm/dts/imx8mq-evk-u-boot.dtsi | 4 +-
arch/arm/dts/imx8mq-librem5-r4-u-boot.dtsi | 4 +-
arch/arm/dts/imx8mq-phanbell-u-boot.dtsi | 4 +-
arch/arm/dts/imx8mq-pico-pi-u-boot.dtsi | 4 +-
arch/arm/dts/imx8mq-u-boot.dtsi | 12 +--
arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi | 64 ++++++-------
arch/arm/dts/imx8ulp-evk-u-boot.dtsi | 18 ++--
arch/arm/dts/imx93-11x11-evk-u-boot.dtsi | 50 +++++------
arch/arm/dts/imxrt1020-evk-u-boot.dtsi | 40 ++++-----
arch/arm/dts/imxrt1050-evk-u-boot.dtsi | 40 ++++-----
arch/arm/dts/imxrt1170-evk-u-boot.dtsi | 44 ++++-----
arch/arm/dts/k3-am625-r5-sk.dts | 26 +++---
arch/arm/dts/k3-am625-sk-u-boot.dtsi | 60 ++++++-------
arch/arm/dts/k3-am62a-ddr.dtsi | 2 +-
arch/arm/dts/k3-am62a7-r5-sk.dts | 22 ++---
arch/arm/dts/k3-am62a7-sk-u-boot.dtsi | 62 ++++++-------
arch/arm/dts/k3-am64-ddr.dtsi | 2 +-
arch/arm/dts/k3-am642-evm-u-boot.dtsi | 44 ++++-----
arch/arm/dts/k3-am642-r5-evm.dts | 32 +++----
arch/arm/dts/k3-am642-r5-sk.dts | 26 +++---
arch/arm/dts/k3-am642-sk-u-boot.dtsi | 72 +++++++--------
.../dts/k3-am65-iot2050-common-u-boot.dtsi | 44 ++++-----
arch/arm/dts/k3-am654-ddr.dtsi | 2 +-
.../dts/k3-am654-r5-base-board-u-boot.dtsi | 68 +++++++-------
arch/arm/dts/k3-am654-r5-base-board.dts | 52 +++++------
.../arm/dts/k3-am68-sk-base-board-u-boot.dtsi | 46 +++++-----
arch/arm/dts/k3-am68-sk-r5-base-board.dts | 22 ++---
.../k3-j7200-common-proc-board-u-boot.dtsi | 66 +++++++-------
.../arm/dts/k3-j7200-r5-common-proc-board.dts | 38 ++++----
.../k3-j721e-common-proc-board-u-boot.dtsi | 84 ++++++++---------
arch/arm/dts/k3-j721e-ddr.dtsi | 2 +-
.../k3-j721e-r5-common-proc-board-u-boot.dtsi | 4 +-
.../arm/dts/k3-j721e-r5-common-proc-board.dts | 38 ++++----
arch/arm/dts/k3-j721e-r5-sk-u-boot.dtsi | 4 +-
arch/arm/dts/k3-j721e-r5-sk.dts | 32 +++----
arch/arm/dts/k3-j721e-sk-u-boot.dtsi | 70 +++++++--------
.../k3-j721s2-common-proc-board-u-boot.dtsi | 48 +++++-----
arch/arm/dts/k3-j721s2-ddr.dtsi | 6 +-
.../dts/k3-j721s2-r5-common-proc-board.dts | 22 ++---
arch/arm/dts/keystone-k2e-evm-u-boot.dtsi | 4 +-
arch/arm/dts/keystone-k2g-evm-u-boot.dtsi | 6 +-
arch/arm/dts/keystone-k2g-generic-u-boot.dtsi | 6 +-
arch/arm/dts/keystone-k2g-ice-u-boot.dtsi | 6 +-
arch/arm/dts/keystone-k2hk-evm-u-boot.dtsi | 4 +-
.../logicpd-som-lv-35xx-devkit-u-boot.dtsi | 16 ++--
.../logicpd-som-lv-37xx-devkit-u-boot.dtsi | 16 ++--
.../logicpd-torpedo-35xx-devkit-u-boot.dtsi | 16 ++--
.../logicpd-torpedo-37xx-devkit-u-boot.dtsi | 14 +--
arch/arm/dts/ls1021a-twr-u-boot.dtsi | 14 +--
arch/arm/dts/meson-g12-common-u-boot.dtsi | 4 +-
arch/arm/dts/meson-gx-u-boot.dtsi | 4 +-
arch/arm/dts/mt7622-bananapi-bpi-r64.dts | 2 +-
arch/arm/dts/mt7622-rfb.dts | 4 +-
arch/arm/dts/mt7622-u-boot.dtsi | 12 +--
arch/arm/dts/mt7623-u-boot.dtsi | 12 +--
arch/arm/dts/mt7629-rfb-u-boot.dtsi | 18 ++--
arch/arm/dts/mt7629-rfb.dts | 8 +-
arch/arm/dts/mt7981.dtsi | 14 +--
arch/arm/dts/mt7986-u-boot.dtsi | 14 +--
arch/arm/dts/mt7986.dtsi | 8 +-
arch/arm/dts/mt8516-u-boot.dtsi | 10 +--
arch/arm/dts/mvebu-u-boot.dtsi | 12 +--
arch/arm/dts/omap3-u-boot.dtsi | 34 +++----
arch/arm/dts/omap5-u-boot.dtsi | 40 ++++-----
arch/arm/dts/phycore-imx8mm-u-boot.dtsi | 30 +++----
arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi | 30 +++----
arch/arm/dts/px30-u-boot.dtsi | 30 +++----
arch/arm/dts/qcom-ipq4019.dtsi | 10 +--
arch/arm/dts/qcs404-evb-uboot.dtsi | 8 +-
arch/arm/dts/r7s72100-gr-peach-u-boot.dts | 10 +--
arch/arm/dts/r8a774a1-u-boot.dtsi | 2 +-
arch/arm/dts/r8a774b1-u-boot.dtsi | 2 +-
arch/arm/dts/r8a774e1-u-boot.dtsi | 2 +-
arch/arm/dts/r8a7790-lager-u-boot.dts | 2 +-
arch/arm/dts/r8a7790-stout-u-boot.dts | 2 +-
arch/arm/dts/r8a7790-u-boot.dtsi | 6 +-
arch/arm/dts/r8a7791-koelsch-u-boot.dts | 2 +-
arch/arm/dts/r8a7791-porter-u-boot.dts | 2 +-
arch/arm/dts/r8a7791-u-boot.dtsi | 6 +-
arch/arm/dts/r8a7792-blanche-u-boot.dts | 2 +-
arch/arm/dts/r8a7792-u-boot.dtsi | 4 +-
arch/arm/dts/r8a7793-gose-u-boot.dts | 2 +-
arch/arm/dts/r8a7793-u-boot.dtsi | 6 +-
arch/arm/dts/r8a7794-alt-u-boot.dts | 2 +-
arch/arm/dts/r8a7794-silk-u-boot.dts | 2 +-
arch/arm/dts/r8a7794-u-boot.dtsi | 6 +-
arch/arm/dts/r8a77950-salvator-x-u-boot.dts | 6 +-
arch/arm/dts/r8a77950-u-boot.dtsi | 2 +-
arch/arm/dts/r8a77950-ulcb-u-boot.dts | 6 +-
arch/arm/dts/r8a77960-salvator-x-u-boot.dts | 6 +-
arch/arm/dts/r8a77960-u-boot.dtsi | 2 +-
arch/arm/dts/r8a77960-ulcb-u-boot.dts | 6 +-
arch/arm/dts/r8a77965-salvator-x-u-boot.dts | 6 +-
arch/arm/dts/r8a77965-u-boot.dtsi | 2 +-
arch/arm/dts/r8a77965-ulcb-u-boot.dts | 6 +-
arch/arm/dts/r8a77970-u-boot.dtsi | 2 +-
arch/arm/dts/r8a77980-u-boot.dtsi | 2 +-
arch/arm/dts/r8a77990-ebisu-u-boot.dts | 6 +-
arch/arm/dts/r8a779a0-u-boot.dtsi | 2 +-
arch/arm/dts/r8a779x-u-boot.dtsi | 8 +-
arch/arm/dts/rk3036-sdk-u-boot.dtsi | 6 +-
arch/arm/dts/rk3066a-mk808-u-boot.dtsi | 8 +-
arch/arm/dts/rk3128-evb-u-boot.dtsi | 2 +-
arch/arm/dts/rk3128-u-boot.dtsi | 6 +-
arch/arm/dts/rk3188-radxarock-u-boot.dtsi | 10 +--
arch/arm/dts/rk3229-evb-u-boot.dtsi | 4 +-
arch/arm/dts/rk322x-u-boot.dtsi | 8 +-
arch/arm/dts/rk3288-evb-u-boot.dtsi | 20 ++---
arch/arm/dts/rk3288-firefly-u-boot.dtsi | 30 +++----
arch/arm/dts/rk3288-miqi-u-boot.dtsi | 20 ++---
arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi | 14 +--
arch/arm/dts/rk3288-popmetal-u-boot.dtsi | 20 ++---
arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi | 8 +-
arch/arm/dts/rk3288-rock2-square-u-boot.dtsi | 8 +-
arch/arm/dts/rk3288-tinker-s-u-boot.dtsi | 10 +--
arch/arm/dts/rk3288-tinker-u-boot.dtsi | 32 +++----
arch/arm/dts/rk3288-u-boot.dtsi | 18 ++--
arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi | 8 +-
arch/arm/dts/rk3288-veyron-u-boot.dtsi | 20 ++---
arch/arm/dts/rk3288-vyasa-u-boot.dtsi | 8 +-
arch/arm/dts/rk3308-evb-u-boot.dtsi | 2 +-
arch/arm/dts/rk3308-roc-cc-u-boot.dtsi | 2 +-
arch/arm/dts/rk3308-u-boot.dtsi | 10 +--
arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi | 32 +++----
arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 10 +--
arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 10 +--
arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi | 10 +--
arch/arm/dts/rk3328-rock64-u-boot.dtsi | 12 +--
arch/arm/dts/rk3328-u-boot.dtsi | 14 +--
arch/arm/dts/rk3368-geekbox-u-boot.dtsi | 14 +--
arch/arm/dts/rk3368-lion-haikou-u-boot.dtsi | 28 +++---
arch/arm/dts/rk3368-px5-evb-u-boot.dtsi | 22 ++---
arch/arm/dts/rk3368-sheep-u-boot.dtsi | 14 +--
arch/arm/dts/rk3399-evb-u-boot.dtsi | 6 +-
arch/arm/dts/rk3399-gru-u-boot.dtsi | 2 +-
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 6 +-
arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 4 +-
arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 20 ++---
arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 2 +-
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 2 +-
arch/arm/dts/rk3399-u-boot.dtsi | 38 ++++----
arch/arm/dts/rk3568-evb-u-boot.dtsi | 2 +-
arch/arm/dts/rk356x-u-boot.dtsi | 14 +--
arch/arm/dts/rk3xxx-u-boot.dtsi | 8 +-
arch/arm/dts/rv1108-u-boot.dtsi | 2 +-
arch/arm/dts/rv1126-u-boot.dtsi | 24 ++---
arch/arm/dts/rz-g2-beacon-u-boot.dtsi | 10 +--
arch/arm/dts/s5p4418.dtsi | 4 +-
arch/arm/dts/s700-u-boot.dtsi | 6 +-
arch/arm/dts/s900-u-boot.dtsi | 6 +-
arch/arm/dts/sam9x60ek-u-boot.dtsi | 36 ++++----
arch/arm/dts/sama5d2.dtsi | 52 +++++------
arch/arm/dts/sama5d27_som1.dtsi | 8 +-
arch/arm/dts/sama5d3.dtsi | 72 +++++++--------
arch/arm/dts/sama5d3xdm.dtsi | 6 +-
arch/arm/dts/sama5d3xmb.dtsi | 18 ++--
arch/arm/dts/sama5d3xmb_cmp.dtsi | 4 +-
arch/arm/dts/sama5d4.dtsi | 50 +++++------
arch/arm/dts/socfpga-common-u-boot.dtsi | 10 +--
arch/arm/dts/socfpga_agilex-u-boot.dtsi | 20 ++---
arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 6 +-
arch/arm/dts/socfpga_arria10-handoff.dtsi | 42 ++++-----
arch/arm/dts/socfpga_arria10-u-boot.dtsi | 44 ++++-----
.../dts/socfpga_arria10_handoff_u-boot.dtsi | 44 ++++-----
.../socfpga_arria10_mercury_aa1-u-boot.dtsi | 20 ++---
.../arm/dts/socfpga_arria10_socdk-u-boot.dtsi | 4 +-
.../socfpga_arria10_socdk_sdmmc-u-boot.dtsi | 14 +--
arch/arm/dts/socfpga_arria5_secu1.dts | 6 +-
arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 8 +-
arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts | 4 +-
.../socfpga_cyclone5_de0_nano_soc-u-boot.dtsi | 4 +-
arch/arm/dts/socfpga_cyclone5_de10_nano.dts | 4 +-
.../dts/socfpga_cyclone5_de10_standard.dts | 4 +-
arch/arm/dts/socfpga_cyclone5_de1_soc.dts | 4 +-
arch/arm/dts/socfpga_cyclone5_is1.dts | 8 +-
.../dts/socfpga_cyclone5_mcvevk-u-boot.dtsi | 4 +-
.../dts/socfpga_cyclone5_socdk-u-boot.dtsi | 8 +-
.../dts/socfpga_cyclone5_sockit-u-boot.dtsi | 8 +-
.../dts/socfpga_cyclone5_socrates-u-boot.dtsi | 8 +-
arch/arm/dts/socfpga_cyclone5_sr1500.dts | 8 +-
.../socfpga_cyclone5_vining_fpga-u-boot.dtsi | 10 +--
arch/arm/dts/socfpga_n5x-u-boot.dtsi | 26 +++---
arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi | 6 +-
arch/arm/dts/socfpga_stratix10.dtsi | 10 +--
.../dts/socfpga_stratix10_socdk-u-boot.dtsi | 10 +--
arch/arm/dts/socfpga_stratix10_socdk.dts | 2 +-
arch/arm/dts/starqltechn-uboot.dtsi | 12 +--
arch/arm/dts/stm32429i-eval-u-boot.dtsi | 54 +++++------
arch/arm/dts/stm32746g-eval-u-boot.dtsi | 8 +-
arch/arm/dts/stm32f429-disco-u-boot.dtsi | 52 +++++------
arch/arm/dts/stm32f469-disco-u-boot.dtsi | 54 +++++------
arch/arm/dts/stm32f7-u-boot.dtsi | 38 ++++----
arch/arm/dts/stm32f746-disco-u-boot.dtsi | 12 +--
arch/arm/dts/stm32f769-disco-u-boot.dtsi | 12 +--
arch/arm/dts/stm32h7-u-boot.dtsi | 44 ++++-----
arch/arm/dts/stm32mp13-u-boot.dtsi | 46 +++++-----
arch/arm/dts/stm32mp135f-dk-u-boot.dtsi | 8 +-
arch/arm/dts/stm32mp15-ddr.dtsi | 2 +-
arch/arm/dts/stm32mp15-scmi-u-boot.dtsi | 46 +++++-----
arch/arm/dts/stm32mp15-u-boot.dtsi | 64 ++++++-------
arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi | 8 +-
arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 34 +++----
...2mp157a-icore-stm32mp1-ctouch2-u-boot.dtsi | 16 ++--
...mp157a-icore-stm32mp1-edimm2.2-u-boot.dtsi | 16 ++--
.../stm32mp157a-icore-stm32mp1-u-boot.dtsi | 28 +++---
...rogea-stm32mp1-microdev2.0-of7-u-boot.dtsi | 16 ++--
...-microgea-stm32mp1-microdev2.0-u-boot.dtsi | 16 ++--
.../stm32mp157a-microgea-stm32mp1-u-boot.dtsi | 14 +--
arch/arm/dts/stm32mp157c-ed1-scmi-u-boot.dtsi | 8 +-
arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi | 48 +++++-----
arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 20 ++---
.../dts/stm32mp157c-odyssey-som-u-boot.dtsi | 26 +++---
arch/arm/dts/stm32mp157c-odyssey-u-boot.dtsi | 16 ++--
arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 90 +++++++++----------
.../stm32mp15xx-dhcor-avenger96-u-boot.dtsi | 36 ++++----
.../stm32mp15xx-dhcor-drc-compact-u-boot.dtsi | 34 +++----
.../stm32mp15xx-dhcor-testbench-u-boot.dtsi | 34 +++----
arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi | 56 ++++++------
arch/arm/dts/t8103-u-boot.dtsi | 12 +--
arch/arm/dts/tegra124-nyan-big-u-boot.dtsi | 4 +-
arch/arm/dts/tegra20-u-boot.dtsi | 4 +-
arch/arm/dts/uniphier-v7-u-boot.dtsi | 24 ++---
arch/arm/dts/versal-mini-emmc0.dts | 4 +-
arch/arm/dts/versal-mini-emmc1.dts | 4 +-
arch/arm/dts/versal-mini-ospi.dtsi | 4 +-
arch/arm/dts/versal-mini-qspi.dtsi | 4 +-
arch/arm/dts/versal-mini.dts | 2 +-
arch/arm/dts/versal-net-mini.dts | 8 +-
arch/arm/dts/vf610-bk4r1-u-boot.dtsi | 10 +--
.../arm/dts/vf610-colibri-eval-v3-u-boot.dtsi | 12 +--
arch/arm/dts/zynq-7000.dtsi | 8 +-
arch/arm/dts/zynq-cc108.dts | 2 +-
arch/arm/dts/zynq-cse-nand.dts | 10 +--
arch/arm/dts/zynq-cse-nor.dts | 12 +--
arch/arm/dts/zynq-cse-qspi.dtsi | 10 +--
arch/arm/dts/zynq-dlc20-rev1.0.dts | 6 +-
arch/arm/dts/zynq-microzed.dts | 6 +-
arch/arm/dts/zynq-minized.dts | 2 +-
arch/arm/dts/zynq-picozed.dts | 6 +-
arch/arm/dts/zynq-syzygy-hub.dts | 4 +-
arch/arm/dts/zynq-topic-miami.dts | 6 +-
arch/arm/dts/zynq-zc702.dts | 6 +-
arch/arm/dts/zynq-zc706.dts | 6 +-
arch/arm/dts/zynq-zc770-xm010.dts | 2 +-
arch/arm/dts/zynq-zc770-xm011.dts | 2 +-
arch/arm/dts/zynq-zc770-xm012.dts | 2 +-
arch/arm/dts/zynq-zc770-xm013.dts | 2 +-
arch/arm/dts/zynq-zed.dts | 6 +-
arch/arm/dts/zynq-zturn-common.dtsi | 8 +-
arch/arm/dts/zynq-zybo-z7.dts | 6 +-
arch/arm/dts/zynq-zybo.dts | 6 +-
arch/arm/dts/zynqmp-a2197-revA.dts | 12 +--
arch/arm/dts/zynqmp-clk-ccf.dtsi | 12 +--
arch/arm/dts/zynqmp-dlc21-revA.dts | 6 +-
arch/arm/dts/zynqmp-mini-emmc0.dts | 4 +-
arch/arm/dts/zynqmp-mini-emmc1.dts | 4 +-
arch/arm/dts/zynqmp-mini-nand.dts | 2 +-
arch/arm/dts/zynqmp-mini-qspi.dts | 2 +-
arch/arm/dts/zynqmp-mini.dts | 2 +-
arch/arm/dts/zynqmp-r5.dts | 6 +-
arch/arm/dts/zynqmp-sm-k26-revA.dts | 6 +-
arch/arm/dts/zynqmp.dtsi | 24 ++---
arch/m68k/dts/M5208EVBE.dts | 2 +-
arch/m68k/dts/M5235EVB.dts | 2 +-
arch/m68k/dts/M5235EVB_Flash32.dts | 2 +-
arch/m68k/dts/M5249EVB.dts | 2 +-
arch/m68k/dts/M5253DEMO.dts | 2 +-
arch/m68k/dts/M5272C3.dts | 2 +-
arch/m68k/dts/M5275EVB.dts | 2 +-
arch/m68k/dts/M5282EVB.dts | 2 +-
arch/m68k/dts/M53017EVB.dts | 2 +-
arch/m68k/dts/M5329AFEE.dts | 2 +-
arch/m68k/dts/M5329BFEE.dts | 2 +-
arch/m68k/dts/M5373EVB.dts | 2 +-
arch/m68k/dts/amcore.dts | 2 +-
arch/m68k/dts/astro_mcf5373l.dts | 2 +-
arch/m68k/dts/cobra5272.dts | 2 +-
arch/m68k/dts/eb_cpu5282.dts | 2 +-
arch/m68k/dts/eb_cpu5282_internal.dts | 2 +-
arch/m68k/dts/stmark2.dts | 2 +-
arch/mips/dts/ar933x.dtsi | 2 +-
arch/mips/dts/brcm,bcm3380.dtsi | 14 +--
arch/mips/dts/brcm,bcm6318.dtsi | 12 +--
arch/mips/dts/brcm,bcm63268.dtsi | 14 +--
arch/mips/dts/brcm,bcm6328.dtsi | 14 +--
arch/mips/dts/brcm,bcm6338.dtsi | 12 +--
arch/mips/dts/brcm,bcm6348.dtsi | 12 +--
arch/mips/dts/brcm,bcm6358.dtsi | 14 +--
arch/mips/dts/brcm,bcm6362.dtsi | 14 +--
arch/mips/dts/brcm,bcm6368.dtsi | 14 +--
arch/mips/dts/brcm,bcm6838.dtsi | 14 +--
arch/mips/dts/brcm,bcm968380gerg.dts | 2 +-
arch/mips/dts/comtrend,ar-5315u.dts | 2 +-
arch/mips/dts/comtrend,ar-5387un.dts | 2 +-
arch/mips/dts/comtrend,ct-5361.dts | 2 +-
arch/mips/dts/comtrend,vr-3032u.dts | 2 +-
arch/mips/dts/comtrend,wap-5813n.dts | 2 +-
arch/mips/dts/huawei,hg556a.dts | 2 +-
arch/mips/dts/img,boston.dts | 6 +-
arch/mips/dts/mrvl,cn73xx.dtsi | 6 +-
arch/mips/dts/mrvl,octeon-ebb7304.dts | 4 +-
arch/mips/dts/mrvl,octeon-nic23.dts | 4 +-
arch/mips/dts/mt7620-u-boot.dtsi | 4 +-
arch/mips/dts/mt7621-u-boot.dtsi | 16 ++--
arch/mips/dts/mt7628-u-boot.dtsi | 16 ++--
arch/mips/dts/mt7628a.dtsi | 2 +-
arch/mips/dts/mti,malta.dts | 2 +-
arch/mips/dts/netgear,cg3100d.dts | 2 +-
arch/mips/dts/netgear,dgnd3700v2.dts | 2 +-
arch/mips/dts/pic32mzda_sk.dts | 6 +-
arch/mips/dts/qca953x.dtsi | 2 +-
arch/mips/dts/sagem,f@st1704.dts | 2 +-
arch/mips/dts/sfr,nb4-ser.dts | 2 +-
arch/nios2/dts/10m50_devboard.dts | 2 +-
arch/powerpc/dts/gdsys/gazerbeam-uboot.dtsi | 18 ++--
arch/powerpc/dts/km8321-uboot.dtsi | 26 +++---
arch/powerpc/dts/km836x-uboot.dtsi | 26 +++---
arch/powerpc/dts/kmcent2-u-boot.dtsi | 6 +-
arch/powerpc/dts/pq3-i2c-0.dtsi | 2 +-
arch/powerpc/dts/pq3-i2c-1.dtsi | 2 +-
arch/powerpc/dts/qoriq-i2c-0.dtsi | 4 +-
arch/powerpc/dts/qoriq-i2c-1.dtsi | 4 +-
arch/powerpc/dts/socrates-u-boot.dtsi | 4 +-
arch/riscv/dts/ae350-u-boot.dtsi | 28 +++---
arch/riscv/dts/fu540-c000-u-boot.dtsi | 34 +++----
arch/riscv/dts/fu740-c000-u-boot.dtsi | 36 ++++----
.../dts/hifive-unleashed-a00-u-boot.dtsi | 14 +--
.../dts/hifive-unmatched-a00-u-boot.dtsi | 14 +--
arch/riscv/dts/k210.dtsi | 8 +-
arch/riscv/dts/openpiton-riscv64.dts | 8 +-
arch/sandbox/dts/sandbox.dts | 6 +-
arch/sandbox/dts/sandbox.dtsi | 48 +++++-----
arch/sandbox/dts/sandbox64.dts | 4 +-
arch/sandbox/dts/test.dts | 22 ++---
arch/sh/dts/sh7751-r2dplus.dts | 4 +-
arch/x86/cpu/mp_init.c | 4 +-
arch/x86/dts/bayleybay.dts | 14 +--
arch/x86/dts/baytrail_som-db5800-som-6867.dts | 14 +--
arch/x86/dts/cherryhill.dts | 2 +-
arch/x86/dts/chromebook_coral.dts | 74 +++++++--------
arch/x86/dts/chromebook_link.dts | 46 +++++-----
arch/x86/dts/chromebook_samus.dts | 74 +++++++--------
arch/x86/dts/chromebox_panther.dts | 8 +-
arch/x86/dts/conga-qeval20-qa3-e3845.dts | 14 +--
arch/x86/dts/coreboot.dts | 4 +-
arch/x86/dts/cougarcanyon2.dts | 10 +--
arch/x86/dts/crownbay.dts | 18 ++--
arch/x86/dts/dfi-bt700.dtsi | 16 ++--
arch/x86/dts/edison.dts | 4 +-
arch/x86/dts/efi-x86_app.dts | 2 +-
arch/x86/dts/efi-x86_payload.dts | 2 +-
arch/x86/dts/galileo.dts | 8 +-
arch/x86/dts/minnowmax.dts | 14 +--
arch/x86/dts/qemu-x86_i440fx.dts | 10 +--
arch/x86/dts/qemu-x86_q35.dts | 10 +--
arch/x86/dts/reset.dtsi | 2 +-
arch/x86/dts/rtc.dtsi | 2 +-
arch/x86/dts/serial.dtsi | 2 +-
arch/x86/dts/tsc_timer.dtsi | 2 +-
doc/README.TPL | 4 +-
doc/develop/driver-model/design.rst | 15 ++--
.../driver-model/fs_firmware_loader.rst | 4 +-
doc/develop/driver-model/of-plat.rst | 25 +++---
doc/develop/driver-model/pci-info.rst | 10 +--
doc/develop/driver-model/serial-howto.rst | 24 ++---
doc/develop/spl.rst | 5 +-
doc/device-tree-bindings/bootph.yaml | 88 ++++++++++++++++++
doc/device-tree-bindings/chosen.txt | 2 +-
.../clock/rockchip,rk3368-dmc.txt | 2 +-
.../clock/rockchip,rk3399-dmc.txt | 2 +-
.../clock/st,stm32mp1.txt | 22 ++---
doc/device-tree-bindings/device.txt | 6 +-
.../fsp/fsp2/apollolake/fsp-s.txt | 2 +-
.../memory-controller/k3-j721e-ddrss.txt | 2 +-
.../memory-controllers/k3-am654-ddrss.txt | 2 +-
doc/device-tree-bindings/misc/fs_loader.txt | 8 +-
doc/device-tree-bindings/net/mdio-mux-reg.txt | 2 +-
doc/device-tree-bindings/pci/x86-pci.txt | 4 +-
.../pinctrl/nexell,s5pxx18-pinctrl.txt | 2 +-
.../ram/fsl,mpc83xx-mem-controller.txt | 2 +-
.../video/atmel-hlcdc.txt | 2 +-
drivers/core/ofnode.c | 10 +--
drivers/video/video-uclass.c | 4 +-
dts/Kconfig | 2 +-
include/dm/device.h | 2 +-
include/dm/ofnode.h | 10 +--
scripts/Makefile.lib | 12 +--
test/dm/test-fdt.c | 2 +-
test/py/tests/test_ofplatdata.py | 8 +-
tools/binman/binman.rst | 3 +-
tools/dtoc/dtb_platdata.py | 10 +--
tools/dtoc/test/dtoc_test_add_prop.dts | 4 +-
tools/dtoc/test/dtoc_test_addr32.dts | 4 +-
tools/dtoc/test/dtoc_test_addr32_64.dts | 6 +-
tools/dtoc/test/dtoc_test_addr64.dts | 6 +-
tools/dtoc/test/dtoc_test_addr64_32.dts | 6 +-
tools/dtoc/test/dtoc_test_alias_bad.dts | 6 +-
tools/dtoc/test/dtoc_test_alias_bad_path.dts | 6 +-
tools/dtoc/test/dtoc_test_alias_bad_uc.dts | 6 +-
tools/dtoc/test/dtoc_test_aliases.dts | 4 +-
tools/dtoc/test/dtoc_test_driver_alias.dts | 2 +-
tools/dtoc/test/dtoc_test_inst.dts | 6 +-
tools/dtoc/test/dtoc_test_invalid_driver.dts | 2 +-
tools/dtoc/test/dtoc_test_noparent.dts | 6 +-
tools/dtoc/test/dtoc_test_noprops.dts | 2 +-
tools/dtoc/test/dtoc_test_phandle.dts | 10 +--
tools/dtoc/test/dtoc_test_phandle_bad.dts | 2 +-
tools/dtoc/test/dtoc_test_phandle_bad2.dts | 4 +-
.../dtoc/test/dtoc_test_phandle_cd_gpios.dts | 10 +--
tools/dtoc/test/dtoc_test_phandle_reorder.dts | 4 +-
tools/dtoc/test/dtoc_test_phandle_single.dts | 4 +-
tools/dtoc/test/dtoc_test_simple.dts | 10 +--
tools/dtoc/test/dtoc_test_single_reg.dts | 4 +-
tools/dtoc/test_fdt.py | 8 +-
613 files changed, 4430 insertions(+), 4340 deletions(-)
create mode 100644 doc/device-tree-bindings/bootph.yaml
--
2.39.1.456.gfc5497dd1b-goog
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/6] schemas: Add schema for U-Boot driver model 'phase tags'
2023-01-29 1:26 [PATCH v2 0/6] dm: Move to new driver model schema for device tree tags Simon Glass
@ 2023-01-29 1:26 ` Simon Glass
2023-01-29 1:26 ` [PATCH v2 3/6] dm: doc: Update device tree binding docs for new schema Simon Glass
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Glass @ 2023-01-29 1:26 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, U-Boot Custodians, Simon Glass
U-Boot has some particular challenges with device tree and devices:
- U-Boot has multiple build phases, such as a Secondary Program Loader
(SPL) phase which typically runs in a pre-SDRAM environment where code
and data space are limited. In particular, there may not be enough
space for the full device tree blob. U-Boot uses various automated
techniques to reduce the size from perhaps 40KB to 3KB. It is not
always possible to handle these tags entirely at build time, since
U-Boot proper must have the full device tree, even though we do not
want it to process all nodes until after relocation.
- Some U-Boot phases needs to run before the clocks are properly set up,
where the CPU may be running very slowly. Therefore it is important to
bind only those devices which are actually needed in that phase
- U-Boot uses lazy initialisation for its devices, with 'bind' and
'probe' being separate steps. Even if a device is bound, it is not
actually probed until it is used. This is necessary to keep the boot
time reasonable, e.g. to under a second
The phases of U-Boot in order are: TPL, VPL, SPL, U-Boot (first
pre-relocation, then post-relocation). ALl but the last two are optional.
For the above reasons, U-Boot only includes the full device tree in the
final 'U-Boot proper' build. Even then, before relocation U-Boot only
processes nodes which are marked as being needed.
For this to work, U-Boot's driver model[1] provides a way to mark device
tree nodes as applicable for a particular phase. This works by adding a
tag to the node, e.g.:
cru: clock-controller@ff760000 {
bootph-all;
compatible = "rockchip,rk3399-cru";
reg = <0x0 0xff760000 0x0 0x1000>;
rockchip,grf = <&grf>;
#clock-cells = <1>;
#reset-cells = <1>;
...
};
Here the "bootph-all" tag indicates that the node must be present in all
phases, since the clock driver is required.
There has been discussion over the years about whether this could be done
in a property instead, e.g.
options {
bootph-all = <&cru> <&gpio_a> ...;
...
};
Some problems with this:
- we need to be able to merge several such tags from different .dtsi files
since many boards have their own specific requirements
- it is hard to find and cross-reference the affected nodes
- it is more error-prone
- it requires significant tool rework in U-Boot, including fdtgrep and
the build system
- is harder (slower, more code) to process since it involves scanning
another node/property to find out what to do with a particular node
- we don't want to add phandle arguments to the above since we are
referring, e.g., to the clock device as a whole, not a paricular clock
- the of-platdata feature[2], which converts device tree to C for even
more constrained environments, would need to become aware of the
/options node
There is also the question about whether this needs to be U-Boot-specific,
or whether the tags could be generic. From what I can tell, U-Boot is the
only bootloader which seriously attempts to use a runtime device tree in
all cases. For this version, an attempt is made to name the phases in a
generic manner.
It should also be noted that the approach provided here has stood the test
of time, used in U-Boot for 8 years so far.
So add the schema for this. This will allow a major class of schema
exceptions to be dropped from the U-Boot source tree.
This has been applied upstream[3]
[1] https://u-boot.readthedocs.io/en/latest/develop/driver-model/index.html
[2] https://u-boot.readthedocs.io/en/latest/develop/driver-model/of-plat.html
[3] https://github.com/devicetree-org/dt-schema/commit/63bd847
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2:
- Add binding document
doc/device-tree-bindings/bootph.yaml | 88 ++++++++++++++++++++++++++++
1 file changed, 88 insertions(+)
create mode 100644 doc/device-tree-bindings/bootph.yaml
diff --git a/doc/device-tree-bindings/bootph.yaml b/doc/device-tree-bindings/bootph.yaml
new file mode 100644
index 00000000000..a3ccf06efa7
--- /dev/null
+++ b/doc/device-tree-bindings/bootph.yaml
@@ -0,0 +1,88 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright 2022 Google LLC
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/bootph.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Boot-phase-specific device nodes
+
+maintainers:
+ - Simon Glass <sjg@chromium.org>
+
+description: |
+ Some programs run in memory-constrained environments yet want to make use
+ of device tree.
+
+ The full device tree is often quite large relative to the available memory
+ of a boot phase, so cannot fit into every phase of the boot process. Even
+ when memory is not a problem, some phases may wish to limit which device
+ nodes are present, so as to reduce execution time.
+
+ This binding supports adding tags to device tree nodes to allow them to be
+ marked according to the phases where they should be included.
+
+ Without any tags, nodes are included only in the final phase, where all
+ memory is available. Any untagged nodes are dropped from previous phases
+ and are ignored before the final phase is reached.
+
+ The build process produces a separate executable for each phase. It can
+ use fdtgrep to drop any nodes which are not needed for a particular build.
+ For example, the pre-sram build will drop any nodes which are not marked
+ with bootph-pre-sram or bootph-all tags.
+
+ Note that phase builds may drop the tags, since they have served their
+ purpose by that point. So when looking at phase-specific device tree files
+ you may not see these tags.
+
+ Multiple tags can be used in the same node.
+
+ Tags in a child node are implied to be present in all parent nodes as well.
+ This is important, since some missing properties (such as "ranges", or
+ "compatible") can cause the child node to be ignored or incorrectly
+ parsed.
+
+ That said, at present, fdtgrep applies tags only to the node they are
+ added to, not to any parents. This means U-Boot device tree files often
+ add the same tag to parent nodes, rather than relying on tooling to do
+ this. This is a limitation of fdtgrep and it will be addressed so that
+ 'Linux DTs' do not need to do this.
+
+ The available tags are described as properties below, in order of phase
+ execution.
+
+select: true
+
+properties:
+ bootph-pre-sram:
+ type: boolean
+ description:
+ Enable this node when SRAM is not available. This phase must set up
+ some SRAM or cache-as-RAM so it can obtain data/BSS space to use
+ during execution.
+
+ bootph-verify:
+ type: boolean
+ description:
+ Enable this node in the verification step, which decides which of the
+ available images should be run next.
+
+ bootph-pre-ram:
+ type: boolean
+ description:
+ Enable this node in the phase that sets up SDRAM.
+
+ bootph-some-ram:
+ type: boolean
+ description:
+ Enable this node in the phase that is run after SDRAM is working but
+ before all of it is available. Some RAM is available but it is limited
+ (e.g. it may be split into two pieces by the location of the running
+ program) because the program code is not yet relocated out of the way.
+
+ bootph-all:
+ type: boolean
+ description:
+ Include this node in all phases (for U-Boot see enum u_boot_phase).
+
+additionalProperties: true
--
2.39.1.456.gfc5497dd1b-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/6] dm: doc: Update device tree binding docs for new schema
2023-01-29 1:26 [PATCH v2 0/6] dm: Move to new driver model schema for device tree tags Simon Glass
2023-01-29 1:26 ` [PATCH v2 1/6] schemas: Add schema for U-Boot driver model 'phase tags' Simon Glass
@ 2023-01-29 1:26 ` Simon Glass
2023-01-29 1:26 ` [PATCH v2 4/6] dm: doc: Update documentation for new driver model schema Simon Glass
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Glass @ 2023-01-29 1:26 UTC (permalink / raw)
To: U-Boot Mailing List
Cc: Tom Rini, U-Boot Custodians, Simon Glass, Marek Vasut, Pavel Herrmann
Now that Linux has accepted these tags, move U-Boot over to use them.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
doc/device-tree-bindings/chosen.txt | 2 +-
.../clock/rockchip,rk3368-dmc.txt | 2 +-
.../clock/rockchip,rk3399-dmc.txt | 2 +-
.../clock/st,stm32mp1.txt | 22 +++++++++----------
doc/device-tree-bindings/device.txt | 6 ++---
.../fsp/fsp2/apollolake/fsp-s.txt | 2 +-
| 2 +-
| 2 +-
doc/device-tree-bindings/misc/fs_loader.txt | 8 +++----
doc/device-tree-bindings/net/mdio-mux-reg.txt | 2 +-
doc/device-tree-bindings/pci/x86-pci.txt | 4 ++--
.../pinctrl/nexell,s5pxx18-pinctrl.txt | 2 +-
.../ram/fsl,mpc83xx-mem-controller.txt | 2 +-
.../video/atmel-hlcdc.txt | 2 +-
14 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/doc/device-tree-bindings/chosen.txt b/doc/device-tree-bindings/chosen.txt
index e5ba6720ce1..c8312540f57 100644
--- a/doc/device-tree-bindings/chosen.txt
+++ b/doc/device-tree-bindings/chosen.txt
@@ -129,7 +129,7 @@ Example
};
fs_loader0: fs-loader@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "u-boot,fs-loader";
phandlepart = <&mmc 1>;
};
diff --git a/doc/device-tree-bindings/clock/rockchip,rk3368-dmc.txt b/doc/device-tree-bindings/clock/rockchip,rk3368-dmc.txt
index 8e7357d53d3..da474fbabde 100644
--- a/doc/device-tree-bindings/clock/rockchip,rk3368-dmc.txt
+++ b/doc/device-tree-bindings/clock/rockchip,rk3368-dmc.txt
@@ -54,7 +54,7 @@ Example (for DDR3-1600K and 800MHz)
#include <dt-bindings/memory/rk3368-dmc.h>
dmc: dmc@ff610000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "rockchip,rk3368-dmc";
reg = <0 0xff610000 0 0x400
0 0xff620000 0 0x400>;
diff --git a/doc/device-tree-bindings/clock/rockchip,rk3399-dmc.txt b/doc/device-tree-bindings/clock/rockchip,rk3399-dmc.txt
index a15dc5d1f85..4a56f78f555 100644
--- a/doc/device-tree-bindings/clock/rockchip,rk3399-dmc.txt
+++ b/doc/device-tree-bindings/clock/rockchip,rk3399-dmc.txt
@@ -16,7 +16,7 @@ Required properties:
Example:
dmc: dmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "rockchip,rk3399-dmc";
devfreq-events = <&dfi>;
interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH 0>;
diff --git a/doc/device-tree-bindings/clock/st,stm32mp1.txt b/doc/device-tree-bindings/clock/st,stm32mp1.txt
index 4d4136d2fce..e638bcef7bc 100644
--- a/doc/device-tree-bindings/clock/st,stm32mp1.txt
+++ b/doc/device-tree-bindings/clock/st,stm32mp1.txt
@@ -251,9 +251,9 @@ Example of clock tree initialization
/ {
clocks {
- u-boot,dm-pre-reloc;
+ bootph-all;
clk_hse: clk-hse {
- u-boot,dm-pre-reloc;
+ bootph-all;
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <24000000>;
@@ -261,28 +261,28 @@ Example of clock tree initialization
};
clk_hsi: clk-hsi {
- u-boot,dm-pre-reloc;
+ bootph-all;
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <64000000>;
};
clk_lse: clk-lse {
- u-boot,dm-pre-reloc;
+ bootph-all;
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <32768>;
};
clk_lsi: clk-lsi {
- u-boot,dm-pre-reloc;
+ bootph-all;
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <32000>;
};
clk_csi: clk-csi {
- u-boot,dm-pre-reloc;
+ bootph-all;
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <4000000>;
@@ -292,7 +292,7 @@ Example of clock tree initialization
soc {
rcc: rcc@50000000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "st,stm32mp1-rcc", "syscon";
reg = <0x50000000 0x1000>;
#address-cells = <1>;
@@ -371,7 +371,7 @@ Example of clock tree initialization
reg = <0>;
cfg = < 2 80 0 0 0 PQR(1,0,0) >;
frac = < 0x800 >;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
/* VCO = 1066.0 MHz => P = 266 (AXI), Q = 533 (GPU),
@@ -381,7 +381,7 @@ Example of clock tree initialization
reg = <1>;
cfg = < 2 65 1 0 0 PQR(1,1,1) >;
frac = < 0x1400 >;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
/* VCO = 417.8 MHz => P = 209, Q = 24, R = 11 */
@@ -390,7 +390,7 @@ Example of clock tree initialization
reg = <2>;
cfg = < 1 33 1 16 36 PQR(1,1,1) >;
frac = < 0x1a04 >;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
/* VCO = 594.0 MHz => P = 99, Q = 74, R = 74 */
@@ -398,7 +398,7 @@ Example of clock tree initialization
compatible = "st,stm32mp1-pll";
reg = <3>;
cfg = < 3 98 5 7 7 PQR(1,1,1) >;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
diff --git a/doc/device-tree-bindings/device.txt b/doc/device-tree-bindings/device.txt
index 73ce2a3b5b5..ef4f219e91d 100644
--- a/doc/device-tree-bindings/device.txt
+++ b/doc/device-tree-bindings/device.txt
@@ -54,7 +54,7 @@ pcie-a0@14,0 {
};
p2sb: p2sb@d,0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
reg = <0x02006810 0 0 0 0>;
compatible = "intel,apl-p2sb";
early-regs = <IOMAP_P2SB_BAR 0x100000>;
@@ -62,12 +62,12 @@ p2sb: p2sb@d,0 {
n {
compatible = "intel,apl-pinctrl";
- u-boot,dm-pre-reloc;
+ bootph-all;
intel,p2sb-port-id = <PID_GPIO_N>;
acpi,path = "\\_SB.GPO0";
gpio_n: gpio-n {
compatible = "intel,gpio";
- u-boot,dm-pre-reloc;
+ bootph-all;
gpio-controller;
#gpio-cells = <2>;
linux-name = "INT3452:00";
diff --git a/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt b/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt
index dc8e3251a37..33386ebd385 100644
--- a/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt
+++ b/doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt
@@ -474,7 +474,7 @@ Optional properties:
Example:
&fsp_s {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
fsps,ish-enable = <0>;
fsps,enable-sata = <0>;
--git a/doc/device-tree-bindings/memory-controller/k3-j721e-ddrss.txt b/doc/device-tree-bindings/memory-controller/k3-j721e-ddrss.txt
index 1ea0a701143..2e41096aa62 100644
--- a/doc/device-tree-bindings/memory-controller/k3-j721e-ddrss.txt
+++ b/doc/device-tree-bindings/memory-controller/k3-j721e-ddrss.txt
@@ -57,7 +57,7 @@ memorycontroller: memorycontroller@0298e000 {
ti,ddr-freq2 = <DDRSS_PLL_FREQUENCY_2>;
ti,ddr-fhs-cnt = <DDRSS_PLL_FHS_CNT>;
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,ctl-data = <
DDRSS_CTL_00_DATA
--git a/doc/device-tree-bindings/memory-controllers/k3-am654-ddrss.txt b/doc/device-tree-bindings/memory-controllers/k3-am654-ddrss.txt
index 1e11edf7b19..792560a323a 100644
--- a/doc/device-tree-bindings/memory-controllers/k3-am654-ddrss.txt
+++ b/doc/device-tree-bindings/memory-controllers/k3-am654-ddrss.txt
@@ -42,5 +42,5 @@ Example (AM65x):
reg-names = "ss", "ctl", "phy";
clocks = <&k3_clks 20 0>;
power-domains = <&k3_pds 20>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/doc/device-tree-bindings/misc/fs_loader.txt b/doc/device-tree-bindings/misc/fs_loader.txt
index 884fbf47c0b..542be4b25a0 100644
--- a/doc/device-tree-bindings/misc/fs_loader.txt
+++ b/doc/device-tree-bindings/misc/fs_loader.txt
@@ -20,28 +20,28 @@ ubi in device tree source as shown in below:
sata and ubi as shown in below:
Example for mmc:
fs_loader0: fs-loader@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "u-boot,fs-loader";
phandlepart = <&mmc_0 1>;
};
Example for usb:
fs_loader1: fs-loader@1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "u-boot,fs-loader";
phandlepart = <&usb0 1>;
};
Example for sata:
fs_loader2: fs-loader@2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "u-boot,fs-loader";
phandlepart = <&sata0 1>;
};
Example for ubi:
fs_loader3: fs-loader@3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "u-boot,fs-loader";
mtdpart = "UBI",
ubivol = "ubi0";
diff --git a/doc/device-tree-bindings/net/mdio-mux-reg.txt b/doc/device-tree-bindings/net/mdio-mux-reg.txt
index 0ac34dc423a..0f7c2956877 100644
--- a/doc/device-tree-bindings/net/mdio-mux-reg.txt
+++ b/doc/device-tree-bindings/net/mdio-mux-reg.txt
@@ -16,7 +16,7 @@ Example structure, used on Freescale LS1028A QDS board:
&i2c0 {
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
fpga@66 {
#address-cells = <1>;
diff --git a/doc/device-tree-bindings/pci/x86-pci.txt b/doc/device-tree-bindings/pci/x86-pci.txt
index cf4e5ed595a..e6d4b375353 100644
--- a/doc/device-tree-bindings/pci/x86-pci.txt
+++ b/doc/device-tree-bindings/pci/x86-pci.txt
@@ -31,7 +31,7 @@ pci {
compatible = "pci-x86";
#address-cells = <3>;
#size-cells = <2>;
- u-boot,dm-pre-reloc;
+ bootph-all;
ranges = <0x02000000 0x0 0xc0000000 0xc0000000 0 0x10000000
0x42000000 0x0 0xb0000000 0xb0000000 0 0x10000000
0x01000000 0x0 0x1000 0x1000 0 0xefff>;
@@ -41,7 +41,7 @@ pci {
serial: serial@18,2 {
reg = <0x0200c210 0 0 0 0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "intel,apl-ns16550";
early-regs = <0xde000000 0x20>;
reg-shift = <2>;
diff --git a/doc/device-tree-bindings/pinctrl/nexell,s5pxx18-pinctrl.txt b/doc/device-tree-bindings/pinctrl/nexell,s5pxx18-pinctrl.txt
index 115ab53a4cd..38e322db81c 100644
--- a/doc/device-tree-bindings/pinctrl/nexell,s5pxx18-pinctrl.txt
+++ b/doc/device-tree-bindings/pinctrl/nexell,s5pxx18-pinctrl.txt
@@ -20,7 +20,7 @@ Example:
pinctrl_0: pinctrl@c0010000 {
compatible = "nexell,s5pxx18-pinctrl";
reg = <0xc0010000 0xf000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
Nexell's pin configuration nodes act as a container for an arbitrary number of
diff --git a/doc/device-tree-bindings/ram/fsl,mpc83xx-mem-controller.txt b/doc/device-tree-bindings/ram/fsl,mpc83xx-mem-controller.txt
index da01fe908de..de498aca784 100644
--- a/doc/device-tree-bindings/ram/fsl,mpc83xx-mem-controller.txt
+++ b/doc/device-tree-bindings/ram/fsl,mpc83xx-mem-controller.txt
@@ -249,7 +249,7 @@ memory@2000 {
compatible = "fsl,mpc83xx-mem-controller";
reg = <0x2000 0x1000>;
device_type = "memory";
- u-boot,dm-pre-reloc;
+ bootph-all;
driver_software_override = <DSO_ENABLE>;
p_impedance_override = <DSO_P_IMPEDANCE_NOMINAL>;
diff --git a/doc/device-tree-bindings/video/atmel-hlcdc.txt b/doc/device-tree-bindings/video/atmel-hlcdc.txt
index b378cbf9de8..7c9441ae8b3 100644
--- a/doc/device-tree-bindings/video/atmel-hlcdc.txt
+++ b/doc/device-tree-bindings/video/atmel-hlcdc.txt
@@ -15,7 +15,7 @@ Required properties:
Example:
hlcdc: hlcdc@f0000000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "atmel,sama5d2-hlcdc";
reg = <0xf0000000 0x2000>;
clocks = <&lcdc_clk>;
--
2.39.1.456.gfc5497dd1b-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 4/6] dm: doc: Update documentation for new driver model schema
2023-01-29 1:26 [PATCH v2 0/6] dm: Move to new driver model schema for device tree tags Simon Glass
2023-01-29 1:26 ` [PATCH v2 1/6] schemas: Add schema for U-Boot driver model 'phase tags' Simon Glass
2023-01-29 1:26 ` [PATCH v2 3/6] dm: doc: Update device tree binding docs for new schema Simon Glass
@ 2023-01-29 1:26 ` Simon Glass
2023-01-29 1:26 ` [PATCH v2 5/6] dm: doc: Move to " Simon Glass
2023-01-29 1:26 ` [PATCH v2 6/6] dm: treewide: Complete migration " Simon Glass
4 siblings, 0 replies; 6+ messages in thread
From: Simon Glass @ 2023-01-29 1:26 UTC (permalink / raw)
To: U-Boot Mailing List
Cc: Tom Rini, U-Boot Custodians, Simon Glass, Marek Vasut, Pavel Herrmann
Now that Linux has accepted these tags, move U-Boot over to use them.
Tidy up the comments and formatting, making sure that VPL is mentioned
too.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
doc/README.TPL | 4 +--
doc/develop/driver-model/design.rst | 15 +++++------
.../driver-model/fs_firmware_loader.rst | 4 +--
doc/develop/driver-model/of-plat.rst | 25 ++++++++++---------
doc/develop/driver-model/pci-info.rst | 10 ++++----
doc/develop/driver-model/serial-howto.rst | 24 +++++++++---------
doc/develop/spl.rst | 5 ++--
7 files changed, 45 insertions(+), 42 deletions(-)
diff --git a/doc/README.TPL b/doc/README.TPL
index 72027fd692e..95b466e4af9 100644
--- a/doc/README.TPL
+++ b/doc/README.TPL
@@ -35,8 +35,8 @@ is set. Source files can be compiled for TPL with options chosen in the
board config file.
TPL use a small device tree (u-boot-tpl.dtb), containing only the nodes with
-the pre-relocation properties: 'u-boot,dm-pre-reloc' and 'u-boot,dm-tpl'
-(see README.SPL for details).
+the pre-relocation properties: 'bootph-all' and 'bootph-pre-sram'
+(see doc/develop/spl.rst for details).
For example:
diff --git a/doc/develop/driver-model/design.rst b/doc/develop/driver-model/design.rst
index 20611e85e34..8c2c81d7ac9 100644
--- a/doc/develop/driver-model/design.rst
+++ b/doc/develop/driver-model/design.rst
@@ -1114,12 +1114,12 @@ Pre-Relocation Support
----------------------
For pre-relocation we simply call the driver model init function. Only
-drivers marked with DM_FLAG_PRE_RELOC or the device tree 'u-boot,dm-pre-reloc'
+drivers marked with DM_FLAG_PRE_RELOC or the device tree 'bootph-all'
property are initialised prior to relocation. This helps to reduce the driver
model overhead. This flag applies to SPL and TPL as well, if device tree is
enabled (CONFIG_OF_CONTROL) there.
-Note when device tree is enabled, the device tree 'u-boot,dm-pre-reloc'
+Note when device tree is enabled, the device tree 'bootph-all'
property can provide better control granularity on which device is bound
before relocation. While with DM_FLAG_PRE_RELOC flag of the driver all
devices with the same driver are bound, which requires allocation a large
@@ -1128,14 +1128,15 @@ only way for statically declared devices via U_BOOT_DRVINFO() to be bound
prior to relocation.
It is possible to limit this to specific relocation steps, by using
-the more specialized 'u-boot,dm-spl' and 'u-boot,dm-tpl' flags
-in the device tree node. For U-Boot proper you can use 'u-boot,dm-pre-proper'
+the more specialized 'bootph-pre-ram' and 'bootph-pre-sram' flags
+in the device tree node. For U-Boot proper you can use 'bootph-some-ram'
which means that it will be processed (and a driver bound) in U-Boot proper
prior to relocation, but will not be available in SPL or TPL.
-To reduce the size of SPL and TPL, only the nodes with pre-relocation properties
-('u-boot,dm-pre-reloc', 'u-boot,dm-spl' or 'u-boot,dm-tpl') are keept in their
-device trees (see README.SPL for details); the remaining nodes are always bound.
+To reduce the size of SPL and TPL, only the nodes with pre-relocation
+properties ('bootph-all', 'bootph-pre-ram' or 'bootph-pre-sram') are kept in
+their device trees (see README.SPL for details); the remaining nodes are
+always bound.
Then post relocation we throw that away and re-init driver model again.
For drivers which require some sort of continuity between pre- and
diff --git a/doc/develop/driver-model/fs_firmware_loader.rst b/doc/develop/driver-model/fs_firmware_loader.rst
index a44708cb4c5..b0823700a90 100644
--- a/doc/develop/driver-model/fs_firmware_loader.rst
+++ b/doc/develop/driver-model/fs_firmware_loader.rst
@@ -28,7 +28,7 @@ defined in fs-loader node as shown in below:
Example for block device::
fs_loader0: fs-loader {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "u-boot,fs-loader";
phandlepart = <&mmc 1>;
};
@@ -41,7 +41,7 @@ device, it can be described in FDT as shown in below:
Example for ubi::
fs_loader1: fs-loader {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "u-boot,fs-loader";
mtdpart = "UBI",
ubivol = "ubi0";
diff --git a/doc/develop/driver-model/of-plat.rst b/doc/develop/driver-model/of-plat.rst
index b454f7be85e..01724ba72ce 100644
--- a/doc/develop/driver-model/of-plat.rst
+++ b/doc/develop/driver-model/of-plat.rst
@@ -67,7 +67,7 @@ device. As an example, consider this MMC node:
pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>;
vmmc-supply = <&vcc_sd>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
@@ -632,7 +632,7 @@ the devicetree. For example, if the devicetree has::
grf: grf@20008000 {
compatible = "rockchip,rk3188-grf", "syscon";
reg = <0x20008000 0x200>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
then dtoc looks at the first compatible string ("rockchip,rk3188-grf"),
@@ -685,21 +685,22 @@ indicates that the two nodes have different phase settings. Looking at the
source .dts::
i2c_emul: emul {
- u-boot,dm-spl;
+ bootph-pre-ram;
reg = <0xff>;
compatible = "sandbox,i2c-emul-parent";
emul0: emul0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,i2c-rtc-emul";
#emul-cells = <0>;
};
};
-you can see that the child node 'emul0' usees 'u-boot,dm-pre-reloc', indicating
-that the node is present in all SPL builds, but its parent uses 'u-boot,dm-spl'
-indicating it is only present in SPL, not TPL. For a TPL build, this will fail
-with the above message. The fix is to change 'emul0' to use the same
-'u-boot,dm-spl' condition, so that it is not present in TPL, like its parent.
+you can see that the child node 'emul0' usees 'bootph-all', indicating
+that the node is present in all SPL builds, but its parent uses
+'bootph-pre-ram' indicating it is only present in SPL, not TPL. For a TPL
+build, this will fail with the above message. The fix is to change 'emul0' to
+use the same 'bootph-pre-ram' condition, so that it is not present in TPL,
+like its parent.
Link errors / undefined reference
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -715,16 +716,16 @@ you get a link error, e.g.::
The first one indicates that the device cannot find its driver. This means that
there is a driver 'sandbox_spl_test' but it is not compiled into the build.
Check your Kconfig settings to make sure it is. If you don't want that in the
-build, adjust your phase settings, e.g. by using 'u-boot,dm-spl' in the node
+build, adjust your phase settings, e.g. by using 'bootph-pre-ram' in the node
to exclude it from the TPL build::
spl-test5 {
- u-boot,dm-tpl;
+ bootph-pre-sram;
compatible = "sandbox,spl-test";
stringarray = "tpl";
};
-We can drop the 'u-boot,dm-tpl' line so this node won't appear in the TPL
+We can drop the 'bootph-pre-sram' line so this node won't appear in the TPL
devicetree and thus the driver won't be needed.
The second error above indicates that the MISC uclass is needed by the driver
diff --git a/doc/develop/driver-model/pci-info.rst b/doc/develop/driver-model/pci-info.rst
index 251601a51e3..dea595b6cff 100644
--- a/doc/develop/driver-model/pci-info.rst
+++ b/doc/develop/driver-model/pci-info.rst
@@ -52,7 +52,7 @@ their drivers accordingly. A working example like below::
#address-cells = <3>;
#size-cells = <2>;
compatible = "pci-x86";
- u-boot,dm-pre-reloc;
+ bootph-all;
ranges = <0x02000000 0x0 0x40000000 0x40000000 0 0x80000000
0x42000000 0x0 0xc0000000 0xc0000000 0 0x20000000
0x01000000 0x0 0x2000 0x2000 0 0xe000>;
@@ -61,14 +61,14 @@ their drivers accordingly. A working example like below::
#address-cells = <3>;
#size-cells = <2>;
compatible = "pci-bridge";
- u-boot,dm-pre-reloc;
+ bootph-all;
reg = <0x0000b800 0x0 0x0 0x0 0x0>;
topcliff@0,0 {
#address-cells = <3>;
#size-cells = <2>;
compatible = "pci-bridge";
- u-boot,dm-pre-reloc;
+ bootph-all;
reg = <0x00010000 0x0 0x0 0x0 0x0>;
pciuart0: uart@a,1 {
@@ -77,7 +77,7 @@ their drivers accordingly. A working example like below::
"pciclass,070002",
"pciclass,0700",
"x86-uart";
- u-boot,dm-pre-reloc;
+ bootph-all;
reg = <0x00025100 0x0 0x0 0x0 0x0
0x01025110 0x0 0x0 0x0 0x0>;
......
@@ -98,7 +98,7 @@ bus hierarchy: on the root PCI bus, there is a PCIe root port which connects
to a downstream device Topcliff chipset. Inside Topcliff chipset, it has a
PCIe-to-PCI bridge and all the chipset integrated devices like the PCI UART
device are on the PCI bus. Like other devices in the device tree, if we want
-to bind PCI devices before relocation, "u-boot,dm-pre-reloc" must be declared
+to bind PCI devices before relocation, "bootph-all" must be declared
in each of these nodes.
If PCI devices are not listed in the device tree, U_BOOT_PCI_DEVICE can be used
diff --git a/doc/develop/driver-model/serial-howto.rst b/doc/develop/driver-model/serial-howto.rst
index 5b1d57d83a8..17b53e3cabf 100644
--- a/doc/develop/driver-model/serial-howto.rst
+++ b/doc/develop/driver-model/serial-howto.rst
@@ -62,7 +62,7 @@ what you need. U-Boot automatically includes these files: see :ref:`dttweaks`.
Here are some things you might need to consider:
1. The serial driver itself needs to be present before relocation, so that the
- U-Boot banner appears. Make sure it has a u-boot,dm-pre-reloc tag in the device
+ U-Boot banner appears. Make sure it has a bootph-all tag in the device
tree, so that the serial driver is bound when U-Boot starts.
For example, on iMX8::
@@ -75,11 +75,11 @@ Here are some things you might need to consider:
put this in your xxx-u-boot.dtsi file::
&lpuart3 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
2. If your serial port requires a particular pinmux configuration, you may need
- a pinctrl driver. This needs to have a u-boot,dm-pre-reloc tag also. Take care
+ a pinctrl driver. This needs to have a bootph-all tag also. Take care
that any subnodes have the same tag, if they are needed to make the correct
pinctrl available.
@@ -107,15 +107,15 @@ Here are some things you might need to consider:
parents, so put this in your xxx-u-boot.dtsi file::
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2_xfer {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
3. The same applies to power domains. For example, if a particular power domain
@@ -125,11 +125,11 @@ Here are some things you might need to consider:
For example, on iMX8, put this in your xxx-u-boot.dtsi file::
&pd_dma {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_dma_lpuart3 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
4. The same applies to clocks, in the same way. Make sure that when your driver
@@ -168,10 +168,10 @@ some customisation.
Serial in SPL
-------------
-A similar process is needed in SPL, but in this case the u-boot,dm-spl or
-u-boot,dm-tpl tags are used. Add these in the same way as above, to ensure that
-the SPL device tree contains the required nodes (see spl/u-boot-spl.dtb for
-what it actually contains).
+A similar process is needed in SPL, but in this case the bootph-pre-ram or
+bootph-pre-sram tags are used. Add these in the same way as above, to ensure
+that the SPL device tree contains the required nodes (see spl/u-boot-spl.dtb
+for what it actually contains).
Removing old code
-----------------
diff --git a/doc/develop/spl.rst b/doc/develop/spl.rst
index aec7b562faa..3d1bff81fcd 100644
--- a/doc/develop/spl.rst
+++ b/doc/develop/spl.rst
@@ -113,13 +113,14 @@ with:
- the mandatory nodes (/alias, /chosen, /config)
- the nodes with one pre-relocation property:
- 'u-boot,dm-pre-reloc' or 'u-boot,dm-spl'
+ 'bootph-all' or 'bootph-pre-ram'
fdtgrep is also used to remove:
- the properties defined in CONFIG_OF_SPL_REMOVE_PROPS
- all the pre-relocation properties
- ('u-boot,dm-pre-reloc', 'u-boot,dm-spl' and 'u-boot,dm-tpl')
+ ('bootph-all', 'bootph-pre-ram' (SPL), 'bootph-pre-sram' (TPL) and
+ 'bootph-verify' (TPL))
All the nodes remaining in the SPL devicetree are bound
(see doc/driver-model/design.rst).
--
2.39.1.456.gfc5497dd1b-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 5/6] dm: doc: Move to new driver model schema
2023-01-29 1:26 [PATCH v2 0/6] dm: Move to new driver model schema for device tree tags Simon Glass
` (2 preceding siblings ...)
2023-01-29 1:26 ` [PATCH v2 4/6] dm: doc: Update documentation for new driver model schema Simon Glass
@ 2023-01-29 1:26 ` Simon Glass
2023-01-29 1:26 ` [PATCH v2 6/6] dm: treewide: Complete migration " Simon Glass
4 siblings, 0 replies; 6+ messages in thread
From: Simon Glass @ 2023-01-29 1:26 UTC (permalink / raw)
To: U-Boot Mailing List
Cc: Tom Rini, U-Boot Custodians, Simon Glass, Marek Vasut, Pavel Herrmann
Now that Linux has accepted these tags, update the dtoc tool to use them.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
tools/dtoc/dtb_platdata.py | 10 +++++-----
tools/dtoc/test/dtoc_test_add_prop.dts | 4 ++--
tools/dtoc/test/dtoc_test_addr32.dts | 4 ++--
tools/dtoc/test/dtoc_test_addr32_64.dts | 6 +++---
tools/dtoc/test/dtoc_test_addr64.dts | 6 +++---
tools/dtoc/test/dtoc_test_addr64_32.dts | 6 +++---
tools/dtoc/test/dtoc_test_alias_bad.dts | 6 +++---
tools/dtoc/test/dtoc_test_alias_bad_path.dts | 6 +++---
tools/dtoc/test/dtoc_test_alias_bad_uc.dts | 6 +++---
tools/dtoc/test/dtoc_test_aliases.dts | 4 ++--
tools/dtoc/test/dtoc_test_driver_alias.dts | 2 +-
tools/dtoc/test/dtoc_test_inst.dts | 6 +++---
tools/dtoc/test/dtoc_test_invalid_driver.dts | 2 +-
tools/dtoc/test/dtoc_test_noparent.dts | 6 +++---
tools/dtoc/test/dtoc_test_noprops.dts | 2 +-
tools/dtoc/test/dtoc_test_phandle.dts | 10 +++++-----
tools/dtoc/test/dtoc_test_phandle_bad.dts | 2 +-
tools/dtoc/test/dtoc_test_phandle_bad2.dts | 4 ++--
tools/dtoc/test/dtoc_test_phandle_cd_gpios.dts | 10 +++++-----
tools/dtoc/test/dtoc_test_phandle_reorder.dts | 4 ++--
tools/dtoc/test/dtoc_test_phandle_single.dts | 4 ++--
tools/dtoc/test/dtoc_test_simple.dts | 10 +++++-----
tools/dtoc/test/dtoc_test_single_reg.dts | 4 ++--
tools/dtoc/test_fdt.py | 2 +-
24 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py
index a69a7889ce1..39f416cfd80 100644
--- a/tools/dtoc/dtb_platdata.py
+++ b/tools/dtoc/dtb_platdata.py
@@ -35,9 +35,9 @@ PROP_IGNORE_LIST = [
'linux,phandle',
"status",
'phandle',
- 'u-boot,dm-pre-reloc',
- 'u-boot,dm-tpl',
- 'u-boot,dm-spl',
+ 'bootph-all',
+ 'bootph-pre-sram',
+ 'bootph-pre-ram',
]
# C type declarations for the types we support
@@ -442,7 +442,7 @@ class DtbPlatdata():
"""
parent = node.parent
if parent and not parent.props:
- raise ValueError("Parent node '%s' has no properties - do you need u-boot,dm-spl or similar?" %
+ raise ValueError("Parent node '%s' has no properties - do you need bootph-pre-ram or similar?" %
parent.path)
num_addr, num_size = 2, 2
if parent:
@@ -754,7 +754,7 @@ class DtbPlatdata():
# This might indicate that the parent node is not in the
# SPL/TPL devicetree but the child is. For example if we are
# dealing with of-platdata in TPL, the parent has a
- # u-boot,dm-tpl tag but the child has u-boot,dm-pre-reloc. In
+ # bootph-pre-sram tag but the child has bootph-all. In
# this case the child node exists in TPL but the parent does
# not.
raise ValueError("Node '%s' requires parent node '%s' but it is not in the valid list" %
diff --git a/tools/dtoc/test/dtoc_test_add_prop.dts b/tools/dtoc/test/dtoc_test_add_prop.dts
index fa296e55527..8225de36d27 100644
--- a/tools/dtoc/test/dtoc_test_add_prop.dts
+++ b/tools/dtoc/test/dtoc_test_add_prop.dts
@@ -11,13 +11,13 @@
#address-cells = <1>;
#size-cells = <1>;
spl-test {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
intval = <1>;
};
spl-test2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
intarray = <5>;
};
diff --git a/tools/dtoc/test/dtoc_test_addr32.dts b/tools/dtoc/test/dtoc_test_addr32.dts
index 239045497c6..3e7dc567292 100644
--- a/tools/dtoc/test/dtoc_test_addr32.dts
+++ b/tools/dtoc/test/dtoc_test_addr32.dts
@@ -12,13 +12,13 @@
#size-cells = <1>;
test1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "test1";
reg = <0x1234 0x5678>;
};
test2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "test2";
reg = <0x12345678 0x98765432 2 3>;
};
diff --git a/tools/dtoc/test/dtoc_test_addr32_64.dts b/tools/dtoc/test/dtoc_test_addr32_64.dts
index 7599d5b0a59..7ce16feef1a 100644
--- a/tools/dtoc/test/dtoc_test_addr32_64.dts
+++ b/tools/dtoc/test/dtoc_test_addr32_64.dts
@@ -12,19 +12,19 @@
#size-cells = <2>;
test1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "test1";
reg = <0x1234 0x5678 0x0>;
};
test2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "test2";
reg = <0x12345678 0x98765432 0x10987654>;
};
test3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "test3";
reg = <0x12345678 0x98765432 0x10987654 2 0 3>;
};
diff --git a/tools/dtoc/test/dtoc_test_addr64.dts b/tools/dtoc/test/dtoc_test_addr64.dts
index 263d2513869..5f8c23f04b8 100644
--- a/tools/dtoc/test/dtoc_test_addr64.dts
+++ b/tools/dtoc/test/dtoc_test_addr64.dts
@@ -12,19 +12,19 @@
#size-cells = <2>;
test1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "test1";
reg = /bits/ 64 <0x1234 0x5678>;
};
test2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "test2";
reg = /bits/ 64 <0x1234567890123456 0x9876543210987654>;
};
test3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "test3";
reg = /bits/ 64 <0x1234567890123456 0x9876543210987654 2 3>;
};
diff --git a/tools/dtoc/test/dtoc_test_addr64_32.dts b/tools/dtoc/test/dtoc_test_addr64_32.dts
index 85e4f5fdaeb..bfbfd87b8de 100644
--- a/tools/dtoc/test/dtoc_test_addr64_32.dts
+++ b/tools/dtoc/test/dtoc_test_addr64_32.dts
@@ -12,19 +12,19 @@
#size-cells = <1>;
test1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "test1";
reg = <0x1234 0x0 0x5678>;
};
test2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "test2";
reg = <0x12345678 0x90123456 0x98765432>;
};
test3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "test3";
reg = <0x12345678 0x90123456 0x98765432 0 2 3>;
};
diff --git a/tools/dtoc/test/dtoc_test_alias_bad.dts b/tools/dtoc/test/dtoc_test_alias_bad.dts
index d4f502ad0aa..69761f91146 100644
--- a/tools/dtoc/test/dtoc_test_alias_bad.dts
+++ b/tools/dtoc/test/dtoc_test_alias_bad.dts
@@ -18,20 +18,20 @@
};
spl-test {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
boolval;
intval = <1>;
};
i2c: i2c {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,i2c";
intval = <3>;
};
spl-test3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
stringarray = "one";
longbytearray = [09 0a 0b 0c 0d 0e 0f 10];
diff --git a/tools/dtoc/test/dtoc_test_alias_bad_path.dts b/tools/dtoc/test/dtoc_test_alias_bad_path.dts
index 0beca4f0d03..6f566fe4abf 100644
--- a/tools/dtoc/test/dtoc_test_alias_bad_path.dts
+++ b/tools/dtoc/test/dtoc_test_alias_bad_path.dts
@@ -18,20 +18,20 @@
};
spl-test {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
boolval;
intval = <1>;
};
i2c: i2c {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,i2c";
intval = <3>;
};
spl-test3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
stringarray = "one";
longbytearray = [09 0a 0b 0c 0d 0e 0f 10];
diff --git a/tools/dtoc/test/dtoc_test_alias_bad_uc.dts b/tools/dtoc/test/dtoc_test_alias_bad_uc.dts
index ae64f5b3b29..5d23c63a630 100644
--- a/tools/dtoc/test/dtoc_test_alias_bad_uc.dts
+++ b/tools/dtoc/test/dtoc_test_alias_bad_uc.dts
@@ -18,20 +18,20 @@
};
spl-test {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
boolval;
intval = <1>;
};
i2c: i2c {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,i2c";
intval = <3>;
};
spl-test3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
stringarray = "one";
longbytearray = [09 0a 0b 0c 0d 0e 0f 10];
diff --git a/tools/dtoc/test/dtoc_test_aliases.dts b/tools/dtoc/test/dtoc_test_aliases.dts
index ae337168632..018b834046e 100644
--- a/tools/dtoc/test/dtoc_test_aliases.dts
+++ b/tools/dtoc/test/dtoc_test_aliases.dts
@@ -9,13 +9,13 @@
/ {
spl-test {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "compat1", "compat2.1-fred", "compat3";
intval = <1>;
};
spl-test2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "compat1", "simple_bus";
intval = <1>;
};
diff --git a/tools/dtoc/test/dtoc_test_driver_alias.dts b/tools/dtoc/test/dtoc_test_driver_alias.dts
index da7973b2e50..22369a44069 100644
--- a/tools/dtoc/test/dtoc_test_driver_alias.dts
+++ b/tools/dtoc/test/dtoc_test_driver_alias.dts
@@ -9,7 +9,7 @@
/ {
gpio_a: gpios@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
gpio-controller;
compatible = "sandbox_gpio_alias";
#gpio-cells = <1>;
diff --git a/tools/dtoc/test/dtoc_test_inst.dts b/tools/dtoc/test/dtoc_test_inst.dts
index b8177fcef5f..9689be391bd 100644
--- a/tools/dtoc/test/dtoc_test_inst.dts
+++ b/tools/dtoc/test/dtoc_test_inst.dts
@@ -18,20 +18,20 @@
};
spl-test {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
boolval;
intval = <1>;
};
i2c: i2c {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,i2c";
intval = <3>;
};
spl-test3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
stringarray = "one";
longbytearray = [09 0a 0b 0c 0d 0e 0f 10];
diff --git a/tools/dtoc/test/dtoc_test_invalid_driver.dts b/tools/dtoc/test/dtoc_test_invalid_driver.dts
index 914ac3e899f..042a325913e 100644
--- a/tools/dtoc/test/dtoc_test_invalid_driver.dts
+++ b/tools/dtoc/test/dtoc_test_invalid_driver.dts
@@ -9,7 +9,7 @@
/ {
spl-test {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "invalid";
};
};
diff --git a/tools/dtoc/test/dtoc_test_noparent.dts b/tools/dtoc/test/dtoc_test_noparent.dts
index e976dd2b8af..0efb17e0cbc 100644
--- a/tools/dtoc/test/dtoc_test_noparent.dts
+++ b/tools/dtoc/test/dtoc_test_noparent.dts
@@ -12,18 +12,18 @@
#size-cells = <1>;
i2c@0 {
compatible = "sandbox,i2c";
- u-boot,dm-tpl;
+ bootph-pre-sram;
#address-cells = <1>;
#size-cells = <0>;
spl-test {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
pmic@9 {
compatible = "sandbox,pmic";
- u-boot,dm-pre-reloc;
+ bootph-all;
reg = <9>;
low-power;
};
diff --git a/tools/dtoc/test/dtoc_test_noprops.dts b/tools/dtoc/test/dtoc_test_noprops.dts
index e6fdd11b83d..75296beb319 100644
--- a/tools/dtoc/test/dtoc_test_noprops.dts
+++ b/tools/dtoc/test/dtoc_test_noprops.dts
@@ -13,7 +13,7 @@
i2c@0 {
pmic@9 {
compatible = "sandbox,pmic";
- u-boot,dm-pre-reloc;
+ bootph-all;
reg = <9>;
low-power;
};
diff --git a/tools/dtoc/test/dtoc_test_phandle.dts b/tools/dtoc/test/dtoc_test_phandle.dts
index d9aa433503d..74a146b9a3e 100644
--- a/tools/dtoc/test/dtoc_test_phandle.dts
+++ b/tools/dtoc/test/dtoc_test_phandle.dts
@@ -9,34 +9,34 @@
/ {
phandle: phandle-target {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "target";
intval = <0>;
#clock-cells = <0>;
};
phandle_1: phandle2-target {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "target";
intval = <1>;
#clock-cells = <1>;
};
phandle_2: phandle3-target {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "target";
intval = <2>;
#clock-cells = <2>;
};
phandle-source {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "source";
clocks = <&phandle &phandle_1 11 &phandle_2 12 13 &phandle>;
phandle-name-offset = <&phandle_2>, "fred", <123>;
};
phandle-source2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "source";
clocks = <&phandle>;
};
diff --git a/tools/dtoc/test/dtoc_test_phandle_bad.dts b/tools/dtoc/test/dtoc_test_phandle_bad.dts
index a3ddc595851..94cfada95bb 100644
--- a/tools/dtoc/test/dtoc_test_phandle_bad.dts
+++ b/tools/dtoc/test/dtoc_test_phandle_bad.dts
@@ -9,7 +9,7 @@
/ {
phandle-source {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "source";
clocks = <20>; /* Invalid phandle */
};
diff --git a/tools/dtoc/test/dtoc_test_phandle_bad2.dts b/tools/dtoc/test/dtoc_test_phandle_bad2.dts
index fe25f565fbb..4d24b96ce68 100644
--- a/tools/dtoc/test/dtoc_test_phandle_bad2.dts
+++ b/tools/dtoc/test/dtoc_test_phandle_bad2.dts
@@ -9,13 +9,13 @@
/ {
phandle: phandle-target {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "target";
intval = <0>;
};
phandle-source2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "source";
clocks = <&phandle>;
};
diff --git a/tools/dtoc/test/dtoc_test_phandle_cd_gpios.dts b/tools/dtoc/test/dtoc_test_phandle_cd_gpios.dts
index 241743e73ec..6ad80062666 100644
--- a/tools/dtoc/test/dtoc_test_phandle_cd_gpios.dts
+++ b/tools/dtoc/test/dtoc_test_phandle_cd_gpios.dts
@@ -9,33 +9,33 @@
/ {
phandle: phandle-target {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "target";
intval = <0>;
#gpio-cells = <0>;
};
phandle_1: phandle2-target {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "target";
intval = <1>;
#gpio-cells = <1>;
};
phandle_2: phandle3-target {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "target";
intval = <2>;
#gpio-cells = <2>;
};
phandle-source {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "source";
cd-gpios = <&phandle &phandle_1 11 &phandle_2 12 13 &phandle>;
};
phandle-source2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "source";
cd-gpios = <&phandle>;
};
diff --git a/tools/dtoc/test/dtoc_test_phandle_reorder.dts b/tools/dtoc/test/dtoc_test_phandle_reorder.dts
index aa71d56f27c..573a4f63965 100644
--- a/tools/dtoc/test/dtoc_test_phandle_reorder.dts
+++ b/tools/dtoc/test/dtoc_test_phandle_reorder.dts
@@ -10,13 +10,13 @@
/ {
phandle-source2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "source";
clocks = <&phandle>;
};
phandle: phandle-target {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "target";
#clock-cells = <0>;
};
diff --git a/tools/dtoc/test/dtoc_test_phandle_single.dts b/tools/dtoc/test/dtoc_test_phandle_single.dts
index aacd0b15fa1..1b1763932c7 100644
--- a/tools/dtoc/test/dtoc_test_phandle_single.dts
+++ b/tools/dtoc/test/dtoc_test_phandle_single.dts
@@ -9,14 +9,14 @@
/ {
phandle: phandle-target {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "target";
intval = <0>;
#clock-cells = <0>;
};
phandle-source2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "source";
clocks = <&phandle>;
};
diff --git a/tools/dtoc/test/dtoc_test_simple.dts b/tools/dtoc/test/dtoc_test_simple.dts
index aef07efeaeb..08f667ee5a1 100644
--- a/tools/dtoc/test/dtoc_test_simple.dts
+++ b/tools/dtoc/test/dtoc_test_simple.dts
@@ -11,7 +11,7 @@
#address-cells = <1>;
#size-cells = <1>;
spl-test {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
boolval;
maybe-empty-int = <>;
@@ -27,7 +27,7 @@
};
spl-test2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
intval = <3>;
intarray = <5>;
@@ -40,7 +40,7 @@
};
spl-test3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
stringarray = "one";
longbytearray = [09 0a 0b 0c 0d 0e 0f 10];
@@ -49,12 +49,12 @@
i2c@0 {
compatible = "sandbox,i2c";
- u-boot,dm-pre-reloc;
+ bootph-all;
#address-cells = <1>;
#size-cells = <0>;
pmic@9 {
compatible = "sandbox,pmic";
- u-boot,dm-pre-reloc;
+ bootph-all;
reg = <9>;
low-power;
};
diff --git a/tools/dtoc/test/dtoc_test_single_reg.dts b/tools/dtoc/test/dtoc_test_single_reg.dts
index 804b67855be..035937cfbfa 100644
--- a/tools/dtoc/test/dtoc_test_single_reg.dts
+++ b/tools/dtoc/test/dtoc_test_single_reg.dts
@@ -13,12 +13,12 @@
i2c@0 {
compatible = "sandbox,i2c";
- u-boot,dm-pre-reloc;
+ bootph-all;
#address-cells = <1>;
#size-cells = <0>;
pmic@9 {
compatible = "sandbox,pmic";
- u-boot,dm-pre-reloc;
+ bootph-all;
reg = <9>;
low-power;
diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py
index 3b8ee00d4e0..1c33b888830 100755
--- a/tools/dtoc/test_fdt.py
+++ b/tools/dtoc/test_fdt.py
@@ -135,7 +135,7 @@ class TestFdt(unittest.TestCase):
self.assertEqual(['boolval', 'bytearray', 'byteval', 'compatible',
'int64val', 'intarray', 'intval', 'longbytearray',
'maybe-empty-int', 'notstring', 'stringarray',
- 'stringval', 'u-boot,dm-pre-reloc'],
+ 'stringval', 'bootph-all'],
sorted(props.keys()))
def test_check_error(self):
--
2.39.1.456.gfc5497dd1b-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 6/6] dm: treewide: Complete migration to new driver model schema
2023-01-29 1:26 [PATCH v2 0/6] dm: Move to new driver model schema for device tree tags Simon Glass
` (3 preceding siblings ...)
2023-01-29 1:26 ` [PATCH v2 5/6] dm: doc: Move to " Simon Glass
@ 2023-01-29 1:26 ` Simon Glass
4 siblings, 0 replies; 6+ messages in thread
From: Simon Glass @ 2023-01-29 1:26 UTC (permalink / raw)
To: U-Boot Mailing List
Cc: Tom Rini, U-Boot Custodians, Simon Glass, Marek Vasut, Pavel Herrmann
Update various build and test components to use the new schema.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
drivers/core/ofnode.c | 10 +++++-----
drivers/video/video-uclass.c | 4 ++--
dts/Kconfig | 2 +-
include/dm/device.h | 2 +-
include/dm/ofnode.h | 10 +++++-----
scripts/Makefile.lib | 12 ++++++------
test/dm/test-fdt.c | 2 +-
test/py/tests/test_ofplatdata.py | 8 ++++----
tools/binman/binman.rst | 3 +--
tools/dtoc/test_fdt.py | 8 ++++----
10 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index 4d56b1a7675..5249a60639b 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -1265,22 +1265,22 @@ bool ofnode_pre_reloc(ofnode node)
{
#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_TPL_BUILD)
/* for SPL and TPL the remaining nodes after the fdtgrep 1st pass
- * had property dm-pre-reloc or u-boot,dm-spl/tpl.
+ * had property bootph-all or bootph-pre-sram/bootph-pre-ram.
* They are removed in final dtb (fdtgrep 2nd pass)
*/
return true;
#else
- if (ofnode_read_bool(node, "u-boot,dm-pre-reloc"))
+ if (ofnode_read_bool(node, "bootph-all"))
return true;
- if (ofnode_read_bool(node, "u-boot,dm-pre-proper"))
+ if (ofnode_read_bool(node, "bootph-some-ram"))
return true;
/*
* In regular builds individual spl and tpl handling both
* count as handled pre-relocation for later second init.
*/
- if (ofnode_read_bool(node, "u-boot,dm-spl") ||
- ofnode_read_bool(node, "u-boot,dm-tpl"))
+ if (ofnode_read_bool(node, "bootph-pre-ram") ||
+ ofnode_read_bool(node, "bootph-pre-sram"))
return true;
return false;
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 0ce376ca3f1..17c47f546a1 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -529,8 +529,8 @@ static int video_post_bind(struct udevice *dev)
addr = uc_priv->video_ptr;
size = alloc_fb(dev, &addr);
if (addr < gd->video_bottom) {
- /* Device tree node may need the 'u-boot,dm-pre-reloc' or
- * 'u-boot,dm-pre-proper' tag
+ /* Device tree node may need the 'bootph-all' or
+ * 'bootph-some-ram' tag
*/
printf("Video device '%s' cannot allocate frame buffer memory -ensure the device is set up before relocation\n",
dev->name);
diff --git a/dts/Kconfig b/dts/Kconfig
index bc5f22029ff..d7206641c34 100644
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -352,7 +352,7 @@ config OF_SPL_REMOVE_PROPS
help
Since SPL normally runs in a reduced memory space, the device tree
is cut down to only what is needed to load and start U-Boot. Only
- nodes marked with the property "u-boot,dm-pre-reloc" will be
+ nodes marked with the property "bootph-all" will be
included. In addition, some properties are not used by U-Boot and
can be discarded. This option defines the list of properties to
discard.
diff --git a/include/dm/device.h b/include/dm/device.h
index e9460386ca9..b86bf90609b 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -1070,7 +1070,7 @@ static inline bool device_is_on_pci_bus(const struct udevice *dev)
* sub-nodes and binds drivers for each node where a driver can be found.
*
* If this is called prior to relocation, only pre-relocation devices will be
- * bound (those marked with u-boot,dm-pre-reloc in the device tree, or where
+ * bound (those marked with bootph-all in the device tree, or where
* the driver has the DM_FLAG_PRE_RELOC flag set). Otherwise, all devices will
* be bound.
*
diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index fa9865602d8..793ad37ff2c 100644
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -1176,12 +1176,12 @@ int ofnode_read_simple_size_cells(ofnode node);
* determine if a node was bound in one of SPL/TPL stages.
*
* There are 4 settings currently in use
- * - u-boot,dm-pre-proper: U-Boot proper pre-relocation only
- * - u-boot,dm-pre-reloc: legacy and indicates any of TPL or SPL
+ * - bootph-some-ram: U-Boot proper pre-relocation only
+ * - bootph-all: all phases
* Existing platforms only use it to indicate nodes needed in
- * SPL. Should probably be replaced by u-boot,dm-spl for new platforms.
- * - u-boot,dm-spl: SPL and U-Boot pre-relocation
- * - u-boot,dm-tpl: TPL and U-Boot pre-relocation
+ * SPL. Should probably be replaced by bootph-pre-ram for new platforms.
+ * - bootph-pre-ram: SPL and U-Boot pre-relocation
+ * - bootph-pre-sram: TPL and U-Boot pre-relocation
*
* @node: node to check
* Return: true if node is needed in SPL/TL, false otherwise
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index ac45a884785..8f251831307 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -585,24 +585,24 @@ cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
# ---------------------------------------------------------------------------
# Pass the original device tree file through fdtgrep twice. The first pass
# removes any unwanted nodes (i.e. those which don't have the
-# 'u-boot,dm-pre-reloc' property and thus are not needed by SPL. The second
+# 'bootph-all' property and thus are not needed by SPL. The second
# pass removes various unused properties from the remaining nodes.
# The output is typically a much smaller device tree file.
ifeq ($(CONFIG_VPL_BUILD),y)
-fdtgrep_props := -b u-boot,dm-pre-reloc -b u-boot,dm-vpl
+fdtgrep_props := -b bootph-all -b bootph-verify
else
ifeq ($(CONFIG_TPL_BUILD),y)
-fdtgrep_props := -b u-boot,dm-pre-reloc -b u-boot,dm-tpl
+fdtgrep_props := -b bootph-all -b bootph-pre-sram
else
-fdtgrep_props := -b u-boot,dm-pre-reloc -b u-boot,dm-spl
+fdtgrep_props := -b bootph-all -b bootph-pre-ram
endif
endif
quiet_cmd_fdtgrep = FDTGREP $@
cmd_fdtgrep = $(objtree)/tools/fdtgrep $(fdtgrep_props) -RT $< \
-n /chosen -n /config -O dtb | \
$(objtree)/tools/fdtgrep -r -O dtb - -o $@ \
- -P u-boot,dm-pre-reloc -P u-boot,dm-spl -P u-boot,dm-tpl \
- -P u-boot,dm-vpl \
+ -P bootph-all -P bootph-pre-ram -P bootph-pre-sram \
+ -P bootph-verify \
$(addprefix -P ,$(subst $\",,$(CONFIG_OF_SPL_REMOVE_PROPS)))
# fdt_rm_props
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index 7cd2d046122..9e19ce7345c 100644
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -214,7 +214,7 @@ static int dm_test_fdt_pre_reloc(struct unit_test_state *uts)
/*
* These are 2 pre-reloc devices:
- * one with "u-boot,dm-pre-reloc" property (a-test node), and the other
+ * one with "bootph-all" property (a-test node), and the other
* one whose driver marked with DM_FLAG_PRE_RELOC flag (h-test node).
*/
ut_asserteq(2, list_count_items(&uc->dev_head));
diff --git a/test/py/tests/test_ofplatdata.py b/test/py/tests/test_ofplatdata.py
index e9cce4daf48..51a188454f3 100644
--- a/test/py/tests/test_ofplatdata.py
+++ b/test/py/tests/test_ofplatdata.py
@@ -13,10 +13,10 @@ def test_spl_devicetree(u_boot_console):
fdtgrep = cons.config.build_dir + '/tools/fdtgrep'
output = util.run_and_log(cons, [fdtgrep, '-l', dtb])
- assert "u-boot,dm-pre-reloc" not in output
- assert "u-boot,dm-pre-proper" not in output
- assert "u-boot,dm-spl" not in output
- assert "u-boot,dm-tpl" not in output
+ assert "bootph-all" not in output
+ assert "bootph-some-ram" not in output
+ assert "bootph-pre-ram" not in output
+ assert "bootph-pre-sram" not in output
assert "spl-test5" not in output
assert "spl-test6" not in output
diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst
index 03a99a19bc6..2bcb7d3886f 100644
--- a/tools/binman/binman.rst
+++ b/tools/binman/binman.rst
@@ -1122,8 +1122,7 @@ It is sometimes inconvenient to add a 'binman' node to the .dts file for each
board. This can be done by using #include to bring in a common file. Another
approach supported by the U-Boot build system is to automatically include
a common header. You can then put the binman node (and anything else that is
-specific to U-Boot, such as u-boot,dm-pre-reloc properies) in that header
-file.
+specific to U-Boot, such as bootph-all properies) in that header file.
Binman will search for the following files in arch/<arch>/dts::
diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py
index 1c33b888830..dffa86fc190 100755
--- a/tools/dtoc/test_fdt.py
+++ b/tools/dtoc/test_fdt.py
@@ -132,10 +132,10 @@ class TestFdt(unittest.TestCase):
"""Tests obtaining a list of properties"""
node = self.dtb.GetNode('/spl-test')
props = self.dtb.GetProps(node)
- self.assertEqual(['boolval', 'bytearray', 'byteval', 'compatible',
- 'int64val', 'intarray', 'intval', 'longbytearray',
- 'maybe-empty-int', 'notstring', 'stringarray',
- 'stringval', 'bootph-all'],
+ self.assertEqual(['boolval', 'bootph-all', 'bytearray', 'byteval',
+ 'compatible', 'int64val', 'intarray', 'intval',
+ 'longbytearray', 'maybe-empty-int', 'notstring',
+ 'stringarray', 'stringval', ],
sorted(props.keys()))
def test_check_error(self):
--
2.39.1.456.gfc5497dd1b-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-29 1:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-29 1:26 [PATCH v2 0/6] dm: Move to new driver model schema for device tree tags Simon Glass
2023-01-29 1:26 ` [PATCH v2 1/6] schemas: Add schema for U-Boot driver model 'phase tags' Simon Glass
2023-01-29 1:26 ` [PATCH v2 3/6] dm: doc: Update device tree binding docs for new schema Simon Glass
2023-01-29 1:26 ` [PATCH v2 4/6] dm: doc: Update documentation for new driver model schema Simon Glass
2023-01-29 1:26 ` [PATCH v2 5/6] dm: doc: Move to " Simon Glass
2023-01-29 1:26 ` [PATCH v2 6/6] dm: treewide: Complete migration " Simon Glass
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.