Merge tag 'u-boot-imx-20190415' of git://git.denx.de/u-boot-imx

[oweals/u-boot.git] / arch / arm / dts / stm32f746-disco.dts

diff --git a/arch/arm/dts/stm32f746-disco.dts b/arch/arm/dts/stm32f746-disco.dts
index e47f762e54dce20adca8f7f077e11ff61998e0fb..babd37f1c11b57c269e58e48ae70535eba6eb85d 100644 (file)
--- a/arch/arm/dts/stm32f746-disco.dts
+++ b/arch/arm/dts/stm32f746-disco.dts
@@ -48,6 +48,7 @@
 /dts-v1/;
 #include "stm32f746.dtsi"
 #include <dt-bindings/memory/stm32-sdram.h>
+#include <dt-bindings/gpio/gpio.h>
 
 / {
        model = "STMicroelectronics STM32F746-DISCO board";
@@ -296,7 +297,7 @@
        qflash0: n25q128a {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "micron,n25q128a13", "spi-flash";
+                       compatible = "micron,n25q128a13", "jedec,spi-nor";
                        spi-max-frequency = <108000000>;
                        spi-tx-bus-width = <1>;
                        spi-rx-bus-width = <1>;
@@ -307,8 +308,7 @@
 
 &sdio {
        status = "okay";
-       cd-gpios = <&gpioc 13 0>;
-       cd-inverted;
+       cd-gpios = <&gpioc 13 GPIO_ACTIVE_LOW>;
        pinctrl-names = "default", "opendrain";
        pinctrl-0 = <&sdio_pins>;
        pinctrl-1 = <&sdio_pins_od>;