Merge git://git.denx.de/u-boot-sh

[u-boot] / arch / arm / dts / at91-sama5d2_xplained.dts

diff --git a/arch/arm/dts/at91-sama5d2_xplained.dts b/arch/arm/dts/at91-sama5d2_xplained.dts
index 37094376b9b6c9d5f17018ef606c8743692788ee..3e624f142c6542f14b0b50e4dc0b46f1d13c9498 100644 (file)
--- a/arch/arm/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/dts/at91-sama5d2_xplained.dts
@@ -7,6 +7,7 @@
        compatible = "atmel,sama5d2-xplained", "atmel,sama5d2", "atmel,sama5";
 
        chosen {
+               u-boot,dm-pre-reloc;
                stdout-path = &uart1;
        };
 
@@ -28,6 +29,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_sdmmc0_cmd_dat_default &pinctrl_sdmmc0_ck_cd_default>;
                        status = "okay";
+                       u-boot,dm-pre-reloc;
                };
 
                sdmmc1: sdio-host@b0000000 {
@@ -35,6 +37,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_sdmmc1_cmd_dat_default &pinctrl_sdmmc1_ck_cd_default>;
                        status = "okay"; /* conflict with qspi0 */
+                       u-boot,dm-pre-reloc;
                };
 
                apb {
@@ -67,11 +70,13 @@
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi0_default>;
                                status = "okay";
+                               u-boot,dm-pre-reloc;
 
                                spi_flash@0 {
                                        compatible = "spi-flash";
                                        reg = <0>;
                                        spi-max-frequency = <50000000>;
+                                       u-boot,dm-pre-reloc;
                                };
                        };
 
@@ -90,6 +95,7 @@
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_uart1_default>;
                                status = "okay";
+                               u-boot,dm-pre-reloc;
                        };
 
                        i2c1: i2c@fc028000 {
@@ -146,6 +152,7 @@
                                                         <PIN_PA8__SDMMC0_DAT6>,
                                                         <PIN_PA9__SDMMC0_DAT7>;
                                                bias-pull-up;
+                                               u-boot,dm-pre-reloc;
                                        };
 
                                        pinctrl_sdmmc0_ck_cd_default: sdmmc0_ck_cd_default {
@@ -154,6 +161,7 @@
                                                         <PIN_PA11__SDMMC0_VDDSEL>,
                                                         <PIN_PA13__SDMMC0_CD>;
                                                bias-disable;
+                                               u-boot,dm-pre-reloc;
                                        };
 
                                        pinctrl_sdmmc1_cmd_dat_default: sdmmc1_cmd_dat_default {
@@ -163,12 +171,14 @@
                                                         <PIN_PA20__SDMMC1_DAT2>,
                                                         <PIN_PA21__SDMMC1_DAT3>;
                                                bias-pull-up;
+                                               u-boot,dm-pre-reloc;
                                        };
 
                                        pinctrl_sdmmc1_ck_cd_default: sdmmc1_ck_cd_default {
                                                pinmux = <PIN_PA22__SDMMC1_CK>,
                                                         <PIN_PA30__SDMMC1_CD>;
                                                bias-disable;
+                                               u-boot,dm-pre-reloc;
                                        };
 
                                        pinctrl_spi0_default: spi0_default {
@@ -176,12 +186,14 @@
                                                         <PIN_PA15__SPI0_MOSI>,
                                                         <PIN_PA16__SPI0_MISO>;
                                                bias-disable;
+                                               u-boot,dm-pre-reloc;
                                        };
 
                                        pinctrl_uart1_default: uart1_default {
                                                pinmux = <PIN_PD2__URXD1>,
                                                         <PIN_PD3__UTXD1>;
                                                bias-disable;
+                                               u-boot,dm-pre-reloc;
                                        };
 
                                        pinctrl_usb_default: usb_default {