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 bbe90fa..4f34fc9 100644 (file)
--- a/arch/arm/dts/stm32f746-disco-u-boot.dtsi
+++ b/arch/arm/dts/stm32f746-disco-u-boot.dtsi
@@ -78,10 +78,6 @@
        };
 };
 
-&clk_hse {
-       u-boot,dm-pre-reloc;
-};
-
 &fmc {
        /* Memory configuration from sdram datasheet MT48LC_4M32_B2B5-6A */
        bank1: bank@0 {
@@ -123,9 +119,7 @@
        };
 
        fmc_pins: fmc@0 {
-               u-boot,dm-pre-reloc;
                pins {
-                       u-boot,dm-pre-reloc;
                        pinmux = <STM32_PINMUX('D',10, AF12)>, /* D15 */
                                 <STM32_PINMUX('D', 9, AF12)>, /* D14 */
                                 <STM32_PINMUX('D', 8, AF12)>, /* D13 */
@@ -218,7 +212,7 @@
                };
        };
 
-       usart1_pins_b: usart1@1 {
+       usart1_pins_b: usart1-1 {
                u-boot,dm-pre-reloc;
                pins1 {
                        u-boot,dm-pre-reloc;
@@ -235,17 +229,13 @@
 
 &qspi {
        reg = <0xA0001000 0x1000>, <0x90000000 0x1000000>;
-       qflash0: n25q128a {
+       qflash0: n25q128a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "micron,n25q128a13", "jedec,spi-nor";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <108000000>;
                spi-tx-bus-width = <4>;
                spi-rx-bus-width = <4>;
                reg = <0>;
        };
 };
-
-&timer5 {
-       u-boot,dm-pre-reloc;
-};