diff options
| author | Tom Rini <trini@konsulko.com> | 2016-08-28 10:36:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-08-28 10:36:20 -0400 |
| commit | ff62bdfbd5dd67d37901002a35b541f2c65ad78d (patch) | |
| tree | e6f3990b140ea1f469b5c16cd334404b7d3faedd /arch/arm/dts | |
| parent | b89dfcfd926b8224edd24608065eb9bb601c0d3b (diff) | |
| parent | 8d11f804130d27a8f5ed6954f3a8a7f62a10ac45 (diff) | |
| download | u-boot-imx-ff62bdfbd5dd67d37901002a35b541f2c65ad78d.zip u-boot-imx-ff62bdfbd5dd67d37901002a35b541f2c65ad78d.tar.gz u-boot-imx-ff62bdfbd5dd67d37901002a35b541f2c65ad78d.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/uniphier-ph1-sld3-ref.dts | 8 | ||||
| -rw-r--r-- | arch/arm/dts/uniphier-ph1-sld3.dtsi | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/dts/uniphier-ph1-sld3-ref.dts b/arch/arm/dts/uniphier-ph1-sld3-ref.dts index 099df83..0863588 100644 --- a/arch/arm/dts/uniphier-ph1-sld3-ref.dts +++ b/arch/arm/dts/uniphier-ph1-sld3-ref.dts @@ -85,3 +85,11 @@ &serial0 { u-boot,dm-pre-reloc; }; + +&mio { + u-boot,dm-pre-reloc; +}; + +&emmc { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/uniphier-ph1-sld3.dtsi b/arch/arm/dts/uniphier-ph1-sld3.dtsi index c3adaf1..6a95541 100644 --- a/arch/arm/dts/uniphier-ph1-sld3.dtsi +++ b/arch/arm/dts/uniphier-ph1-sld3.dtsi @@ -61,6 +61,7 @@ #size-cells = <1>; ranges; interrupt-parent = <&intc>; + u-boot,dm-pre-reloc; timer@20000200 { compatible = "arm,cortex-a9-global-timer"; |