Merge tag 'u-boot-imx-20191105' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / arch / arm / dts / stm32f7-u-boot.dtsi

diff --git a/arch/arm/dts/stm32f7-u-boot.dtsi b/arch/arm/dts/stm32f7-u-boot.dtsi
index cf0cc3b408ae7d42b9f606f8f516fdf79a0dd0cc..32613c976947734aad65d75de362b1cca4990664 100644 (file)
--- a/arch/arm/dts/stm32f7-u-boot.dtsi
+++ b/arch/arm/dts/stm32f7-u-boot.dtsi
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 
+#include <dt-bindings/memory/stm32-sdram.h>
 /{
        soc {
                u-boot,dm-pre-reloc;
@@ -43,7 +44,7 @@
                };
 
                qspi: quadspi@A0001000 {
-                       compatible = "st,stm32-qspi";
+                       compatible = "st,stm32f469-qspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xA0001000 0x1000>, <0x90000000 0x10000000>;
@@ -64,58 +65,41 @@
 };
 
 &gpioa {
-       compatible = "st,stm32-gpio";
        u-boot,dm-pre-reloc;
 };
 
 &gpiob {
-       compatible = "st,stm32-gpio";
        u-boot,dm-pre-reloc;
 };
 
 &gpioc {
-       compatible = "st,stm32-gpio";
        u-boot,dm-pre-reloc;
 };
 
 &gpiod {
-       compatible = "st,stm32-gpio";
        u-boot,dm-pre-reloc;
 };
 
 &gpioe {
-       compatible = "st,stm32-gpio";
        u-boot,dm-pre-reloc;
 };
 
 &gpiof {
-       compatible = "st,stm32-gpio";
        u-boot,dm-pre-reloc;
 };
 
 &gpiog {
-       compatible = "st,stm32-gpio";
        u-boot,dm-pre-reloc;
 };
 
 &gpioh {
-       compatible = "st,stm32-gpio";
        u-boot,dm-pre-reloc;
 };
 
 &gpioi {
-       compatible = "st,stm32-gpio";
        u-boot,dm-pre-reloc;
 };
 
-&gpioj {
-       compatible = "st,stm32-gpio";
-};
-
-&gpiok {
-       compatible = "st,stm32-gpio";
-};
-
 &pinctrl {
        u-boot,dm-pre-reloc;
 
@@ -126,16 +110,6 @@
                 u-boot,dm-pre-reloc;
                };
        };
-
-       usart1_pins_a: usart1@0 {
-               u-boot,dm-pre-reloc;
-               pins1 {
-                       u-boot,dm-pre-reloc;
-               };
-               pins2 {
-                       u-boot,dm-pre-reloc;
-               };
-       };
 };
 
 &pwrcfg {
@@ -152,4 +126,5 @@
 
 &usart1 {
        u-boot,dm-pre-reloc;
+       clocks = <&rcc 0 STM32F7_APB2_CLOCK(USART1)>;
 };