diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-16 15:12:51 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-16 15:12:51 +0100 |
commit | 88000c146a55cf0758007fadcac870e54e227256 (patch) | |
tree | 092ed776103d944a83f7085474bf96fd4bb5665c /arch | |
parent | 35657deea1a2a38fdca16443edde56fa372b0db2 (diff) | |
parent | b2c29efae4efdb2b5086942c36137ddd0ea13cd2 (diff) | |
download | barebox-88000c146a55cf0758007fadcac870e54e227256.tar.gz barebox-88000c146a55cf0758007fadcac870e54e227256.tar.xz |
Merge branch 'for-next/dts' into next
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/dts/dove-cubox-bb.dts | 2 | ||||
-rw-r--r-- | arch/arm/dts/imx51-zii-rdu1.dts | 4 | ||||
-rw-r--r-- | arch/arm/dts/imx6qdl-zii-rdu2.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/dts/imx7d-zii-rmu2.dts | 4 | ||||
-rw-r--r-- | arch/arm/dts/imx8mq-zii-ultra.dtsi | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/dts/dove-cubox-bb.dts b/arch/arm/dts/dove-cubox-bb.dts index 06966d9c2e..a310a41709 100644 --- a/arch/arm/dts/dove-cubox-bb.dts +++ b/arch/arm/dts/dove-cubox-bb.dts @@ -11,6 +11,6 @@ }; }; -&{/leds/power} { +&{/leds/led-power} { barebox,default-trigger = "heartbeat"; }; diff --git a/arch/arm/dts/imx51-zii-rdu1.dts b/arch/arm/dts/imx51-zii-rdu1.dts index 72f5484bc0..927a08101a 100644 --- a/arch/arm/dts/imx51-zii-rdu1.dts +++ b/arch/arm/dts/imx51-zii-rdu1.dts @@ -97,12 +97,12 @@ spinor: &{ecspi1/flash@1} { }; }; -&{uart3/rave-sp/watchdog} { +&{uart3/mcu/watchdog} { nvmem-cells = <&boot_source>; nvmem-cell-names = "boot-source"; }; -&{uart3/rave-sp/eeprom@a4} { +&{uart3/mcu/eeprom@a4} { nvmem-cells = <&shadow_config>; nvmem-cell-names = "shadow-config"; diff --git a/arch/arm/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/dts/imx6qdl-zii-rdu2.dtsi index 2e6a74dde0..84af21c68f 100644 --- a/arch/arm/dts/imx6qdl-zii-rdu2.dtsi +++ b/arch/arm/dts/imx6qdl-zii-rdu2.dtsi @@ -178,12 +178,12 @@ }; }; -&{uart4/rave-sp/watchdog} { +&{uart4/mcu/watchdog} { nvmem-cells = <&boot_source>; nvmem-cell-names = "boot-source"; }; -&{uart4/rave-sp/eeprom@a4} { +&{uart4/mcu/eeprom@a4} { lru_part_number: lru-part-number@21 { reg = <0x21 15>; read-only; diff --git a/arch/arm/dts/imx7d-zii-rmu2.dts b/arch/arm/dts/imx7d-zii-rmu2.dts index 17d625b83e..02e0273134 100644 --- a/arch/arm/dts/imx7d-zii-rmu2.dts +++ b/arch/arm/dts/imx7d-zii-rmu2.dts @@ -33,12 +33,12 @@ nor_flash: &{ecspi1/flash@0} { }; }; -&{uart4/rave-sp/watchdog} { +&{uart4/mcu/watchdog} { nvmem-cells = <&boot_source>; nvmem-cell-names = "boot-source"; }; -&{uart4/rave-sp/eeprom@a3} { +&{uart4/mcu/eeprom@a3} { boot_source: boot-source@83 { reg = <0x83 1>; }; diff --git a/arch/arm/dts/imx8mq-zii-ultra.dtsi b/arch/arm/dts/imx8mq-zii-ultra.dtsi index 27ffebc154..d45c243027 100644 --- a/arch/arm/dts/imx8mq-zii-ultra.dtsi +++ b/arch/arm/dts/imx8mq-zii-ultra.dtsi @@ -64,12 +64,12 @@ nvmem-cell-names = "mac-address"; }; -&{uart2/rave-sp/watchdog} { +&{uart2/mcu/watchdog} { nvmem-cells = <&boot_source>; nvmem-cell-names = "boot-source"; }; -&{uart2/rave-sp/eeprom@a4} { +&{uart2/mcu/eeprom@a4} { lru_part_number: lru-part-number@21 { reg = <0x21 15>; read-only; |