Merge git://git.denx.de/u-boot-usb

[oweals/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 bc337b1628b8770a9fc69a8c0fa690c0d4e4ff07..d8f9d8dc5f2a7d5647ba3ba16d5ef416eaf1814b 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 */
@@ -234,14 +228,14 @@
 };
 
 &qspi {
+       reg = <0xA0001000 0x1000>, <0x90000000 0x1000000>;
        qflash0: n25q128a {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "micron,n25q128a13", "jedec,spi-nor";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <108000000>;
-               spi-tx-bus-width = <1>;
-               spi-rx-bus-width = <1>;
-               memory-map = <0x90000000 0x1000000>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
                reg = <0>;
        };
 };