summaryrefslogtreecommitdiffstats
path: root/arch/arm/dts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-12-07 08:13:02 -0500
committerTom Rini <trini@konsulko.com>2015-12-07 08:13:02 -0500
commitdcf4cb068e19a7f39e4a295102b247376bd27c95 (patch)
tree181457dc202707b9ee622d6dce5117aab8e102d5 /arch/arm/dts
parent25ef4bea59dadbd25dec1dbb376ed84dfc735f02 (diff)
parent8bebf03c73cd0830cb2cd234021004cde67c6412 (diff)
downloadblackbird-obmc-uboot-dcf4cb068e19a7f39e4a295102b247376bd27c95.tar.gz
blackbird-obmc-uboot-dcf4cb068e19a7f39e4a295102b247376bd27c95.zip
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm/dts')
-rw-r--r--arch/arm/dts/zynq-zc702.dts3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts
index c41723641e..528cd27796 100644
--- a/arch/arm/dts/zynq-zc702.dts
+++ b/arch/arm/dts/zynq-zc702.dts
@@ -18,6 +18,7 @@
i2c0 = &i2c0;
serial0 = &uart1;
spi0 = &qspi;
+ mmc0 = &sdhci0;
};
memory {
@@ -370,6 +371,7 @@
};
&sdhci0 {
+ u-boot,dm-pre-reloc;
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdhci0_default>;
@@ -383,6 +385,7 @@
};
&qspi {
+ u-boot,dm-pre-reloc;
status = "okay";
};
OpenPOWER on IntegriCloud