Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[u-boot] / arch / arm / dts / dra7-evm.dts

diff --git a/arch/arm/dts/dra7-evm.dts b/arch/arm/dts/dra7-evm.dts
index 096f68be99e2b962a9b9ee86a22a978509477aad..08ef04e177b038bb500b4b134d783788fba0ab4b 100644 (file)
--- a/arch/arm/dts/dra7-evm.dts
+++ b/arch/arm/dts/dra7-evm.dts
@@ -14,6 +14,11 @@
        model = "TI DRA742";
        compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7";
 
+       chosen {
+               stdout-path = &uart1;
+               tick-timer = &timer2;
+       };
+
        memory {
                device_type = "memory";
                reg = <0x80000000 0x60000000>; /* 1536 MB */
@@ -464,6 +469,11 @@
        status = "okay";
        vmmc-supply = <&ldo1_reg>;
        bus-width = <4>;
+       /*
+        * SDCD signal is not being used here - using the fact that GPIO mode
+        * is always hardwired.
+        */
+       cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>;
 };
 
 &mmc2 {
@@ -483,7 +493,7 @@
 
        spi-max-frequency = <48000000>;
        m25p80@0 {
-               compatible = "s25fl256s1";
+               compatible = "s25fl256s1","spi-flash";
                spi-max-frequency = <48000000>;
                reg = <0>;
                spi-tx-bus-width = <1>;