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

[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..fe755c05841d4e33f5a602847f2edf9f027394cd 100644 (file)
--- a/arch/arm/dts/dra7-evm.dts
+++ b/arch/arm/dts/dra7-evm.dts
@@ -14,11 +14,25 @@
        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 */
        };
 
+       evm_3v3_sd: fixedregulator-sd {
+               compatible = "regulator-fixed";
+               regulator-name = "evm_3v3_sd";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               enable-active-high;
+               gpio = <&pcf_gpio_21 5 GPIO_ACTIVE_HIGH>;
+       };
+
        mmc2_3v3: fixedregulator-mmc2 {
                compatible = "regulator-fixed";
                regulator-name = "mmc2_3v3";
@@ -410,6 +424,7 @@
                interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
                interrupt-controller;
                #interrupt-cells = <2>;
+               u-boot,i2c-offset-len = <0>;
        };
 
 };
@@ -462,8 +477,14 @@
 
 &mmc1 {
        status = "okay";
-       vmmc-supply = <&ldo1_reg>;
+       vmmc-supply = <&evm_3v3_sd>;
+       vmmc_aux-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 {
@@ -481,15 +502,13 @@
        pinctrl-names = "default";
        pinctrl-0 = <&qspi1_pins>;
 
-       spi-max-frequency = <48000000>;
+       spi-max-frequency = <76800000>;
        m25p80@0 {
-               compatible = "s25fl256s1";
-               spi-max-frequency = <48000000>;
+               compatible = "s25fl256s1","spi-flash";
+               spi-max-frequency = <64000000>;
                reg = <0>;
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <4>;
-               spi-cpol;
-               spi-cpha;
                #address-cells = <1>;
                #size-cells = <1>;