Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / arch / arm / dts / stm32f746-disco-u-boot.dtsi

diff --git a/arch/arm/dts/stm32f746-disco-u-boot.dtsi b/arch/arm/dts/stm32f746-disco-u-boot.dtsi
index d8f9d8d..4f34fc9 100644 (file)
--- a/arch/arm/dts/stm32f746-disco-u-boot.dtsi
+++ b/arch/arm/dts/stm32f746-disco-u-boot.dtsi
@@ -212,7 +212,7 @@
                };
        };
 
-       usart1_pins_b: usart1@1 {
+       usart1_pins_b: usart1-1 {
                u-boot,dm-pre-reloc;
                pins1 {
                        u-boot,dm-pre-reloc;
@@ -229,7 +229,7 @@
 
 &qspi {
        reg = <0xA0001000 0x1000>, <0x90000000 0x1000000>;
-       qflash0: n25q128a {
+       qflash0: n25q128a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -239,7 +239,3 @@
                reg = <0>;
        };
 };
-
-&timer5 {
-       u-boot,dm-pre-reloc;
-};