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

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

diff --git a/arch/arm/dts/dra72-evm.dts b/arch/arm/dts/dra72-evm.dts
index efb544c6bb6d49d9f9a1dfc311af5a9cd45ef492..205103e2b0e1ab0a62096bb055ae1f2d4a13d106 100644 (file)
--- a/arch/arm/dts/dra72-evm.dts
+++ b/arch/arm/dts/dra72-evm.dts
@@ -16,6 +16,7 @@
 
        chosen {
                stdout-path = &uart1;
+               tick-timer = &timer2;
        };
 
        memory {
@@ -502,7 +503,7 @@
         * SDCD signal is not being used here - using the fact that GPIO mode
         * is a viable alternative
         */
-       cd-gpios = <&gpio6 27 0>;
+       cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>;
 };
 
 &mmc2 {
@@ -604,7 +605,7 @@
 
        spi-max-frequency = <48000000>;
        m25p80@0 {
-               compatible = "s25fl256s1";
+               compatible = "s25fl256s1","spi-flash";
                spi-max-frequency = <48000000>;
                reg = <0>;
                spi-tx-bus-width = <1>;