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 797d411d6f7160d6c52ad64d86c1db23b287f881..08ef04e177b038bb500b4b134d783788fba0ab4b 100644 (file)
--- a/arch/arm/dts/dra7-evm.dts
+++ b/arch/arm/dts/dra7-evm.dts
@@ -16,6 +16,7 @@
 
        chosen {
                stdout-path = &uart1;
+               tick-timer = &timer2;
        };
 
        memory {
@@ -468,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 {