diff --git a/Documentation/devicetree/index.rst b/Documentation/devicetree/index.rst index 9086526..c5478d1 100644 --- a/Documentation/devicetree/index.rst +++ b/Documentation/devicetree/index.rst @@ -31,6 +31,49 @@ then extends it with barebox-specifics like :ref:`barebox,state`, environment or boot-time device configuration. +Device Tree probing largely happens via compatible properties with no special +meaning to the node names themselves. It's thus paramount that any device tree +nodes extended in the barebox device tree are referenced by a phandle, not by +path, to avoid run-time breakage like this:: + + # Upstream dts/src/$ARCH/board.dts + / { + leds { + led-red { /* formerly named red when the barebox DTS was written */ + /* ... */ + }; + }; + }; + + # barebox arch/$ARCH/dts/board.dts + #include <$ARCH/board.dts> + / { + leds { + red { + barebox,default-trigger = "heartbeat"; + }; + }; + }; + +In the previous example, a device tree sync with upstream resulted in a regression +as the former override became a new node with a single property without effect. + +Using phandles avoids this. When no phandle mapping the full path is defined +upstream, the ``&{/path}`` syntax should be used instead, e.g.:: + + &{/leds/red} { + barebox,default-trigger = "heartbeat"; + }; + +This would lead to a compile error should the ``/leds/red`` path be renamed or +removed. This also applies to uses of ``/delete-node/``. + +Only exception to this rule are well-known node names that are specified by +the `specification`_ to be parsed by name. These are: ``chosen``, ``aliases`` +and ``cpus``, but **not** ``memory``. + +.. _specification: https://www.devicetree.org/specifications/ + Device Tree Compiler -------------------- diff --git a/arch/arm/dts/armada-370-mirabox-bb.dts b/arch/arm/dts/armada-370-mirabox-bb.dts index 3156781..99263d4 100644 --- a/arch/arm/dts/armada-370-mirabox-bb.dts +++ b/arch/arm/dts/armada-370-mirabox-bb.dts @@ -9,14 +9,8 @@ chosen { stdout-path = "/soc/internal-regs/serial@12000"; }; +}; - soc { - internal-regs { - gpio_leds { - green_pwr_led { - barebox,default-trigger = "heartbeat"; - }; - }; - }; - }; +&{/soc/internal-regs/gpio_leds/green_pwr_led} { + barebox,default-trigger = "heartbeat"; }; diff --git a/arch/arm/dts/armada-xp-lenovo-ix4-300d-bb.dts b/arch/arm/dts/armada-xp-lenovo-ix4-300d-bb.dts index 5f1a607..b43bac3 100644 --- a/arch/arm/dts/armada-xp-lenovo-ix4-300d-bb.dts +++ b/arch/arm/dts/armada-xp-lenovo-ix4-300d-bb.dts @@ -5,10 +5,6 @@ #include "arm/armada-xp-lenovo-ix4-300d.dts" -/ { - gpio-leds { - power-led { - linux,default-trigger = "heartbeat"; - }; - }; +&{/gpio-leds/power-led} { + linux,default-trigger = "heartbeat"; }; diff --git a/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts b/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts index e88f1dc..e57cd8f 100644 --- a/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts +++ b/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts @@ -9,14 +9,4 @@ chosen { stdout-path = "/soc/internal-regs/serial@12000"; }; - - soc { - internal-regs { - gpio_leds { - red_led { - barebox,default-trigger = "heartbeat"; - }; - }; - }; - }; }; diff --git a/arch/arm/dts/at91-microchip-ksz9477-evb.dts b/arch/arm/dts/at91-microchip-ksz9477-evb.dts index 075cdcd..a0c3ce3 100644 --- a/arch/arm/dts/at91-microchip-ksz9477-evb.dts +++ b/arch/arm/dts/at91-microchip-ksz9477-evb.dts @@ -27,10 +27,10 @@ file-path = "barebox.env"; }; }; +}; - memory { - reg = <0x20000000 0x10000000>; - }; +&{/memory} { + reg = <0x20000000 0x10000000>; }; &pinctrl { diff --git a/arch/arm/dts/at91sam9263ek.dts b/arch/arm/dts/at91sam9263ek.dts index 7fe283c..9013108 100644 --- a/arch/arm/dts/at91sam9263ek.dts +++ b/arch/arm/dts/at91sam9263ek.dts @@ -7,33 +7,29 @@ }; }; - ahb { - apb { - mmc1: mmc@fff84000 { - pinctrl-0 = < - &pinctrl_board_mmc1 - &pinctrl_mmc1_clk - &pinctrl_mmc1_slot0_cmd_dat0 - &pinctrl_mmc1_slot0_dat1_3>; - cd-gpios = <&pioE 18 GPIO_ACTIVE_HIGH>; - status = "okay"; - slot@0 { - reg = <0>; - bus-width = <4>; - cd-gpios = <&pioE 18 GPIO_ACTIVE_HIGH>; - wp-gpios = <&pioE 19 GPIO_ACTIVE_HIGH>; - }; - }; - }; - }; +}; - - pinctrl@fffff200 { - pinctrl_board_mmc1: mmc1-board { - atmel,pins = - ; /* PE19 gpio WP pin pull up */ +&{/ahb/apb/mmc@fff84000} { + pinctrl-0 = < + &pinctrl_board_mmc1 + &pinctrl_mmc1_clk + &pinctrl_mmc1_slot0_cmd_dat0 + &pinctrl_mmc1_slot0_dat1_3>; + cd-gpios = <&pioE 18 GPIO_ACTIVE_HIGH>; + status = "okay"; + slot@0 { + reg = <0>; + bus-width = <4>; + cd-gpios = <&pioE 18 GPIO_ACTIVE_HIGH>; + wp-gpios = <&pioE 19 GPIO_ACTIVE_HIGH>; }; +}; + +&{/ahb/apb/pinctrl@fffff200} { + pinctrl_board_mmc1: mmc1-board { + atmel,pins = + ; /* PE19 gpio WP pin pull up */ }; }; diff --git a/arch/arm/dts/at91sam9x5ek.dts b/arch/arm/dts/at91sam9x5ek.dts index bc2a279..c753268 100644 --- a/arch/arm/dts/at91sam9x5ek.dts +++ b/arch/arm/dts/at91sam9x5ek.dts @@ -14,25 +14,23 @@ mmc0 = &mmc0; mmc1 = &mmc1; }; +}; - i2c-gpio-0 { - status = "okay"; - }; +&{/i2c-gpio-0} { + status = "okay"; +}; - leds { - /* - * PB18 has a resource conflict since it is both used - * as a heartbeat LED and 1-wire bus in the kernel - * device tree. Because 1-wire EEPROMs contains - * importatnt revision information we move heartbeat - * to PD21 and remove the original pb18 node - */ - /delete-node/ pb18; +/* + * PB18 has a resource conflict since it is both used + * as a heartbeat LED and 1-wire bus in the kernel + * device tree. Because 1-wire EEPROMs contains + * importatnt revision information we move heartbeat + * to PD21 and remove the original pb18 node + */ +/delete-node/ &{/leds/pb18}; - pd21 { - linux,default-trigger = "heartbeat"; - }; - }; +&{/leds/pd21} { + linux,default-trigger = "heartbeat"; }; &spi0 { diff --git a/arch/arm/dts/dove-cubox-bb.dts b/arch/arm/dts/dove-cubox-bb.dts index 83e1d5d..06966d9 100644 --- a/arch/arm/dts/dove-cubox-bb.dts +++ b/arch/arm/dts/dove-cubox-bb.dts @@ -9,10 +9,8 @@ chosen { stdout-path = &uart0; }; +}; - leds { - power { - barebox,default-trigger = "heartbeat"; - }; - }; +&{/leds/power} { + barebox,default-trigger = "heartbeat"; }; diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts index 23e4370..d842387 100644 --- a/arch/arm/dts/fsl-ls1046a-rdb.dts +++ b/arch/arm/dts/fsl-ls1046a-rdb.dts @@ -7,6 +7,7 @@ / { aliases { eeprom = &eeprom; + mmc0 = &esdhc; }; chosen { @@ -17,10 +18,6 @@ device-path = &environment_sd; }; }; - - aliases { - mmc0 = &esdhc; - }; }; &esdhc { @@ -61,72 +58,52 @@ /delete-node/ &non_existent_eeprom; -&fman0 { - ethernet@e0000 { - status = "disabled"; - }; +&enet0 { + status = "disabled"; +}; - ethernet@e2000 { - status = "disabled"; - }; +&enet1 { + status = "disabled"; +}; - ethernet@e4000 { - phy-mode = "rgmii-id"; - }; +&enet2 { + phy-mode = "rgmii-id"; +}; - ethernet@e6000 { - phy-mode = "rgmii-id"; - }; +&enet3 { + phy-mode = "rgmii-id"; +}; - ethernet@e8000 { - }; +&{/soc/fman@1a00000/mdio@e1000} { + status = "disabled"; +}; - ethernet@ea000 { - }; +&{/soc/fman@1a00000/mdio@e3000} { + status = "disabled"; +}; - ethernet@f0000 { - }; +&{/soc/fman@1a00000/mdio@e5000} { + status = "disabled"; +}; - ethernet@f2000 { - }; +&{/soc/fman@1a00000/mdio@e7000} { + status = "disabled"; +}; - mdio@fc000 { - }; +&{/soc/fman@1a00000/mdio@e9000} { + status = "disabled"; +}; - mdio@fd000 { - }; +&{/soc/fman@1a00000/mdio@eb000} { + status = "disabled"; +}; - mdio@e1000 { - status = "disabled"; - }; +&{/soc/fman@1a00000/mdio@f1000} { + status = "disabled"; +}; - mdio@e3000 { - status = "disabled"; - }; - - mdio@e5000 { - status = "disabled"; - }; - - mdio@e7000 { - status = "disabled"; - }; - - mdio@e9000 { - status = "disabled"; - }; - - mdio@eb000 { - status = "disabled"; - }; - - mdio@f1000 { - status = "disabled"; - }; - - mdio@f3000 { - status = "disabled"; - }; +&{/soc/fman@1a00000/mdio@f3000} { + status = "disabled"; }; &usb0 { @@ -143,16 +120,14 @@ dr_mode = "host"; }; -&soc { - pcie1: pcie@3400000 { - status = "okay"; - }; +&{/soc/pcie@3400000} { + status = "okay"; +}; - pcie2: pcie@3500000 { - status = "okay"; - }; +&{/soc/pcie@3500000} { + status = "okay"; +}; - pcie3: pcie@3600000 { - status = "okay"; - }; +&{/soc/pcie@3600000} { + status = "okay"; }; diff --git a/arch/arm/dts/fsl-tqmls1046a-mbls10xxa.dts b/arch/arm/dts/fsl-tqmls1046a-mbls10xxa.dts index 7b17fe2..7f9a764 100644 --- a/arch/arm/dts/fsl-tqmls1046a-mbls10xxa.dts +++ b/arch/arm/dts/fsl-tqmls1046a-mbls10xxa.dts @@ -225,119 +225,118 @@ &fman0 { status = "okay"; +}; - ethernet@e0000 { /* EMAC.1 */ - phy-connection-type = "sgmii"; +&enet0 { /* EMAC.1 */ + phy-connection-type = "sgmii"; +}; +&enet1 { /* EMAC.2 */ + phy-connection-type = "sgmii"; +}; + +&enet2 { /* EMAC.3 */ + phy-handle = <&rgmii_phy1>; + phy-connection-type = "rgmii"; + phy-mode = "rgmii-id"; +}; + +&enet3 { /* EMAC.4 */ + phy-handle = <&rgmii_phy2>; + phy-connection-type = "rgmii"; + phy-mode = "rgmii-id"; +}; + +&enet4 { /* EMAC.5 */ + phy-connection-type = "sgmii"; +}; + +&enet5 { /* EMAC.6 */ + phy-connection-type = "sgmii"; +}; + +&enet6 { /* EMAC.9 */ + phy-connection-type = "sgmii"; +}; + +&enet7 { /* EMAC.10 */ + phy-connection-type = "sgmii"; +}; + +&{/soc/fman@1a00000/mdio@e1000} { + status = "disabled"; +}; + +&{/soc/fman@1a00000/mdio@e3000} { + status = "disabled"; +}; + +&{/soc/fman@1a00000/mdio@e5000} { + status = "disabled"; +}; + +&{/soc/fman@1a00000/mdio@e7000} { + status = "disabled"; +}; + +&{/soc/fman@1a00000/mdio@e9000} { + status = "disabled"; +}; + +&{/soc/fman@1a00000/mdio@eb000} { + status = "disabled"; +}; + +&{/soc/fman@1a00000/mdio@f1000} { + status = "disabled"; +}; + +&{/soc/fman@1a00000/mdio@f3000} { + status = "disabled"; +}; + +&mdio0 { + rgmii_phy1: ethernet-phy@0e { + reg = <0x0e>; + ti,rx-internal-delay = ; + ti,tx-internal-delay = ; + ti,fifo-depth = ; }; - ethernet@e2000 { /* EMAC.2 */ - phy-connection-type = "sgmii"; + rgmii_phy2: ethernet-phy@0c { + reg = <0x0c>; + ti,rx-internal-delay = ; + ti,tx-internal-delay = ; + ti,fifo-depth = ; }; - ethernet@e4000 { /* EMAC.3 */ - phy-handle = <&rgmii_phy1>; - phy-connection-type = "rgmii"; - phy-mode = "rgmii-id"; + qsgmii1_phy1: ethernet-phy@1c { + reg = <0x1c>; }; - ethernet@e6000 { /* EMAC.4 */ - phy-handle = <&rgmii_phy2>; - phy-connection-type = "rgmii"; - phy-mode = "rgmii-id"; + qsgmii1_phy2: ethernet-phy@1d { + reg = <0x1d>; }; - ethernet@e8000 { /* EMAC.5 */ - phy-connection-type = "sgmii"; + qsgmii2_phy1: ethernet-phy@00 { + reg = <0x00>; }; - ethernet@ea000 { /* EMAC.6 */ - phy-connection-type = "sgmii"; + qsgmii2_phy2: ethernet-phy@01 { + reg = <0x01>; }; - ethernet@f0000 { /* EMAC.9 */ - phy-connection-type = "sgmii"; + qsgmii2_phy3: ethernet-phy@02 { + reg = <0x02>; }; - ethernet@f2000 { /* EMAC.10 */ - phy-connection-type = "sgmii"; + qsgmii2_phy4: ethernet-phy@03 { + reg = <0x03>; }; +}; - mdio@e1000 { - status = "disabled"; - }; - - mdio@e3000 { - status = "disabled"; - }; - - mdio@e5000 { - status = "disabled"; - }; - - mdio@e7000 { - status = "disabled"; - }; - - mdio@e9000 { - status = "disabled"; - }; - - mdio@eb000 { - status = "disabled"; - }; - - mdio@f1000 { - status = "disabled"; - }; - - mdio@f3000 { - status = "disabled"; - }; - - mdio@fc000 { - rgmii_phy1: ethernet-phy@0e { - reg = <0x0e>; - ti,rx-internal-delay = ; - ti,tx-internal-delay = ; - ti,fifo-depth = ; - }; - - rgmii_phy2: ethernet-phy@0c { - reg = <0x0c>; - ti,rx-internal-delay = ; - ti,tx-internal-delay = ; - ti,fifo-depth = ; - }; - - qsgmii1_phy1: ethernet-phy@1c { - reg = <0x1c>; - }; - - qsgmii1_phy2: ethernet-phy@1d { - reg = <0x1d>; - }; - - qsgmii2_phy1: ethernet-phy@00 { - reg = <0x00>; - }; - - qsgmii2_phy2: ethernet-phy@01 { - reg = <0x01>; - }; - - qsgmii2_phy3: ethernet-phy@02 { - reg = <0x02>; - }; - - qsgmii2_phy4: ethernet-phy@03 { - reg = <0x03>; - }; - }; - - mdio@fd000 { - status = "disabled"; - }; +&xmdio0 { + status = "disabled"; }; &qflash0 { diff --git a/arch/arm/dts/imx53-guf-vincell-lt.dts b/arch/arm/dts/imx53-guf-vincell-lt.dts index 4c62051..0cc6ffc 100644 --- a/arch/arm/dts/imx53-guf-vincell-lt.dts +++ b/arch/arm/dts/imx53-guf-vincell-lt.dts @@ -30,12 +30,6 @@ }; }; - clocks { - ckih1 { - clock-frequency = <0>; - }; - }; - panel: panel { compatible = "giantplus,gpg482739qs5", "simple-panel"; power-supply = <®_panel>; @@ -119,6 +113,10 @@ }; }; +&{/clocks/ckih1} { + clock-frequency = <0>; +}; + &audmux { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_audmux>; diff --git a/arch/arm/dts/imx53-guf-vincell.dts b/arch/arm/dts/imx53-guf-vincell.dts index d34b59f..9686a2c 100644 --- a/arch/arm/dts/imx53-guf-vincell.dts +++ b/arch/arm/dts/imx53-guf-vincell.dts @@ -25,12 +25,6 @@ stdout-path = &uart2; }; - clocks { - ckih1 { - clock-frequency = <0>; - }; - }; - panel: panel { compatible = "ampire,am800480r3tmqwa1h", "simple-panel"; enable-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; @@ -74,6 +68,10 @@ }; }; +&{/clocks/ckih1} { + clock-frequency = <0>; +}; + &audmux { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_audmux>; diff --git a/arch/arm/dts/imx53-qsb-common.dtsi b/arch/arm/dts/imx53-qsb-common.dtsi index 24bbd67..5c69252 100644 --- a/arch/arm/dts/imx53-qsb-common.dtsi +++ b/arch/arm/dts/imx53-qsb-common.dtsi @@ -19,24 +19,6 @@ device-path = &bareboxenv; }; }; - - /* - * The buttons are marked as active high in the upstream dts. - * Remove these once fixed upstream. - */ - gpio-keys { - power { - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; - }; - - volume-up { - gpios = <&gpio2 14 GPIO_ACTIVE_LOW>; - }; - - volume-down { - gpios = <&gpio2 15 GPIO_ACTIVE_LOW>; - }; - }; }; &esdhc1 { diff --git a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi index 3cb8b37..b83511c 100644 --- a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi @@ -12,8 +12,6 @@ #include / { - /delete-node/ memory@10000000; - chosen { environment-nand { compatible = "barebox,environment"; @@ -53,6 +51,8 @@ }; }; +/delete-node/ &{/memory@10000000}; + &ecspi3 { flash: flash@0 { partitions { diff --git a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi index e99846c..2fb9209 100644 --- a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi @@ -33,10 +33,10 @@ status = "disabled"; }; }; - - /delete-node/ memory@10000000; }; +/delete-node/ &{/memory@10000000}; + &fec { /delete-property/ phy-supply; phy-reset-duration = <10>; /* in msecs */ diff --git a/arch/arm/dts/imx6ul-litesom.dtsi b/arch/arm/dts/imx6ul-litesom.dtsi index 8b73bfd..3776d16 100644 --- a/arch/arm/dts/imx6ul-litesom.dtsi +++ b/arch/arm/dts/imx6ul-litesom.dtsi @@ -3,6 +3,4 @@ * to dynamic memory size detection based on DDR controller settings */ -/ { - /delete-node/ memory@80000000; -}; +/delete-node/ &{/memory@80000000}; diff --git a/arch/arm/dts/imx6ul-pico-hobbit.dts b/arch/arm/dts/imx6ul-pico-hobbit.dts index 2f37b72..0c543de 100644 --- a/arch/arm/dts/imx6ul-pico-hobbit.dts +++ b/arch/arm/dts/imx6ul-pico-hobbit.dts @@ -9,10 +9,6 @@ device-path = &environment_usdhc1; }; }; - - memory { - /delete-property/ device_type; - }; }; &usdhc1 { diff --git a/arch/arm/dts/imx7d-pba-c-09.dtsi b/arch/arm/dts/imx7d-pba-c-09.dtsi index 7106d6b..0b2a987 100644 --- a/arch/arm/dts/imx7d-pba-c-09.dtsi +++ b/arch/arm/dts/imx7d-pba-c-09.dtsi @@ -36,7 +36,6 @@ }; /* Enable if R9 is populated. Conflicts with userbtn2 on PEB-EVAL-02 */ - /* reg_can1_3v3: regulator@2 { compatible = "regulator-fixed"; reg = <2>; @@ -45,8 +44,8 @@ regulator-max-microvolt = <3300000>; gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>; enable-active-high; + status = "disabled"; }; - */ }; }; diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts index c901477..8e64599 100644 --- a/arch/arm/dts/imx7s-warp.dts +++ b/arch/arm/dts/imx7s-warp.dts @@ -18,11 +18,6 @@ device-path = &bareboxenv; }; }; - - memory { - device_type = "memory"; - reg = <0x80000000 0x20000000>; - }; }; &usdhc3 { diff --git a/arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts b/arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts index aba7c06..1be03a7 100644 --- a/arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts +++ b/arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts @@ -5,10 +5,6 @@ #include "arm/kirkwood-guruplug-server-plus.dts" -/ { - gpio-leds { - health-r { - barebox,default-trigger = "heartbeat"; - }; - }; +&{/gpio-leds/health-r} { + barebox,default-trigger = "heartbeat"; }; diff --git a/arch/arm/dts/kirkwood-openblocks_a6-bb.dts b/arch/arm/dts/kirkwood-openblocks_a6-bb.dts index 42bfb07..b13ab2a 100644 --- a/arch/arm/dts/kirkwood-openblocks_a6-bb.dts +++ b/arch/arm/dts/kirkwood-openblocks_a6-bb.dts @@ -4,10 +4,6 @@ #include "arm/kirkwood-openblocks_a6.dts" -/ { - gpio-leds { - led-green { - barebox,default-trigger = "heartbeat"; - }; - }; +&{/gpio-leds/led-green} { + barebox,default-trigger = "heartbeat"; }; diff --git a/arch/arm/dts/kirkwood-topkick-bb.dts b/arch/arm/dts/kirkwood-topkick-bb.dts index 20b74b1..c70d654 100644 --- a/arch/arm/dts/kirkwood-topkick-bb.dts +++ b/arch/arm/dts/kirkwood-topkick-bb.dts @@ -5,10 +5,6 @@ #include "arm/kirkwood-topkick.dts" -/ { - gpio-leds { - system { - barebox,default-trigger = "heartbeat"; - }; - }; +&{/gpio-leds/system} { + barebox,default-trigger = "heartbeat"; }; diff --git a/arch/arm/dts/socfpga_arria10_achilles.dts b/arch/arm/dts/socfpga_arria10_achilles.dts index 4c6460f..2fce011 100644 --- a/arch/arm/dts/socfpga_arria10_achilles.dts +++ b/arch/arm/dts/socfpga_arria10_achilles.dts @@ -124,26 +124,22 @@ default_attempts = <3>; }; }; +}; - soc { - clkmgr@ffd04000 { - clocks { - osc1 { - clock-frequency = <25000000>; - }; +&{/soc/clkmgr@ffd04000/clocks/osc1} { + clock-frequency = <25000000>; +}; - cb_intosc_hs_div2_clk { - clock-frequency = <0>; - }; - cb_intosc_ls_clk { - clock-frequency = <60000000>; - }; - f2s_free_clk { - clock-frequency = <200000000>; - }; - }; - }; - }; +&{/soc/clkmgr@ffd04000/clocks/cb_intosc_hs_div2_clk} { + clock-frequency = <0>; +}; + +&{/soc/clkmgr@ffd04000/clocks/cb_intosc_ls_clk} { + clock-frequency = <60000000>; +}; + +&{/soc/clkmgr@ffd04000/clocks/f2s_free_clk} { + clock-frequency = <200000000>; }; &gmac1 { diff --git a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts index 40a7a9c..427f150 100644 --- a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts +++ b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts @@ -31,10 +31,4 @@ file-path = "barebox.env"; }; }; - - leds: gpio-leds { - }; - - buttons: gpio-keys { - }; }; diff --git a/arch/arm/dts/stm32mp151.dtsi b/arch/arm/dts/stm32mp151.dtsi index a647694..5ff3b96 100644 --- a/arch/arm/dts/stm32mp151.dtsi +++ b/arch/arm/dts/stm32mp151.dtsi @@ -1,10 +1,5 @@ / { - clocks { - /* Needed to let barebox find the clock nodes */ - compatible = "simple-bus"; - }; - aliases { gpio0 = &gpioa; gpio1 = &gpiob; @@ -35,15 +30,21 @@ pwm17 = &{/soc/timer@44008000/pwm}; }; - psci { - compatible = "arm,psci-0.2"; - }; +}; - soc { - memory-controller@5a003000 { - compatible = "st,stm32mp1-ddr"; - reg = <0x5a003000 0x1000>; - }; +&{/clocks} { + /* Needed to let barebox find the clock nodes */ + compatible = "simple-bus"; +}; + +&{/psci} { + compatible = "arm,psci-0.2"; +}; + +&{/soc} { + memory-controller@5a003000 { + compatible = "st,stm32mp1-ddr"; + reg = <0x5a003000 0x1000>; }; }; diff --git a/arch/arm/dts/stm32mp157a-dk1.dtsi b/arch/arm/dts/stm32mp157a-dk1.dtsi index baaf60b..3a10ff9 100644 --- a/arch/arm/dts/stm32mp157a-dk1.dtsi +++ b/arch/arm/dts/stm32mp157a-dk1.dtsi @@ -14,17 +14,17 @@ device-path = &sdmmc1, "partname:barebox-environment"; }; }; +}; - led { - red { - label = "error"; - gpios = <&gpioa 13 GPIO_ACTIVE_LOW>; - default-state = "off"; - status = "okay"; - }; - - blue { - default-state = "on"; - }; +&{/led} { + red { + label = "error"; + gpios = <&gpioa 13 GPIO_ACTIVE_LOW>; + default-state = "off"; + status = "okay"; }; }; + +&{/led/blue} { + default-state = "on"; +}; diff --git a/arch/arm/dts/tegra124-jetson-tk1.dts b/arch/arm/dts/tegra124-jetson-tk1.dts index 00eef6c..7fd97b0 100644 --- a/arch/arm/dts/tegra124-jetson-tk1.dts +++ b/arch/arm/dts/tegra124-jetson-tk1.dts @@ -7,11 +7,7 @@ environment { compatible = "barebox,environment"; - device-path = &emmc, "partname:boot1"; + device-path = &{/sdhci@700b0600}, "partname:boot1"; /* eMMC */ }; }; - - /* eMMC */ - emmc: sdhci@700b0600 { - }; }; diff --git a/arch/arm/dts/versatile-pb.dts b/arch/arm/dts/versatile-pb.dts index 8c80f8c..d374f54 100644 --- a/arch/arm/dts/versatile-pb.dts +++ b/arch/arm/dts/versatile-pb.dts @@ -3,8 +3,8 @@ / { model = "ARM Versatile PB"; compatible = "arm,versatile-pb"; +}; - memory { - reg = <0x0 0x04000000>; - }; +&{/memory} { + reg = <0x0 0x04000000>; }; diff --git a/arch/arm/dts/vf610-zii-cfu1.dts b/arch/arm/dts/vf610-zii-cfu1.dts index 70cd9d1..9226930 100644 --- a/arch/arm/dts/vf610-zii-cfu1.dts +++ b/arch/arm/dts/vf610-zii-cfu1.dts @@ -26,6 +26,10 @@ }; }; +&{/gpio-leds/led-status} { + linux,default-trigger = "heartbeat"; +}; + &i2c0 { fiber_eeprom0: eeprom@50 { compatible = "atmel,24c04"; diff --git a/arch/arm/dts/vf610-zii-dev-rev-b.dts b/arch/arm/dts/vf610-zii-dev-rev-b.dts index abc5237..2949042 100644 --- a/arch/arm/dts/vf610-zii-dev-rev-b.dts +++ b/arch/arm/dts/vf610-zii-dev-rev-b.dts @@ -8,16 +8,12 @@ #include "vf610-zii-dev.dtsi" -/ { - spi0 { - flash@0 { - #address-cells = <1>; - #size-cells = <0>; +&{/spi0/flash@0} { + #address-cells = <1>; + #size-cells = <0>; - partition@0 { - label = "bootloader"; - reg = <0x0 0x100000>; - }; - }; + partition@0 { + label = "bootloader"; + reg = <0x0 0x100000>; }; }; diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts index c03112d..8b8dd84 100644 --- a/arch/arm/dts/zynqmp-zcu104-revA.dts +++ b/arch/arm/dts/zynqmp-zcu104-revA.dts @@ -8,5 +8,4 @@ */ #include -#include "zynqmp.dtsi" #include "zynqmp-clk.dtsi" diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi deleted file mode 100644 index 59984ee..0000000 --- a/arch/arm/dts/zynqmp.dtsi +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * dts file for Xilinx ZynqMP - * - * (C) Copyright 2014 - 2015, Xilinx, Inc. - * - * Michal Simek - */ - -/ { - firmware { - zynqmp_firmware: zynqmp-firmware { - compatible = "xlnx,zynqmp-firmware"; - method = "smc"; - }; - }; -};