diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-24 08:20:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-24 08:20:43 -0400 |
| commit | ec8fb48ce98987065493b27422200897cf0909f8 (patch) | |
| tree | e56d70ee24a04ee26fe75ac2af46c22705da61ed /arch/arm/dts/zynqmp.dtsi | |
| parent | c98dc5a13399414fb651a80d05fa682236c4444e (diff) | |
| parent | ad5b5801264e573bfbf17a20b04c546985c5bfc1 (diff) | |
| download | u-boot-imx-ec8fb48ce98987065493b27422200897cf0909f8.zip u-boot-imx-ec8fb48ce98987065493b27422200897cf0909f8.tar.gz u-boot-imx-ec8fb48ce98987065493b27422200897cf0909f8.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm/dts/zynqmp.dtsi')
| -rw-r--r-- | arch/arm/dts/zynqmp.dtsi | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi index fb95b48..619450e 100644 --- a/arch/arm/dts/zynqmp.dtsi +++ b/arch/arm/dts/zynqmp.dtsi @@ -253,9 +253,9 @@ compatible = "arm,gic-400", "arm,cortex-a15-gic"; #interrupt-cells = <3>; reg = <0x0 0xf9010000 0x10000>, - <0x0 0xf902f000 0x2000>, + <0x0 0xf9020000 0x20000>, <0x0 0xf9040000 0x20000>, - <0x0 0xf906f000 0x2000>; + <0x0 0xf9060000 0x20000>; interrupt-controller; interrupt-parent = <&gic>; interrupts = <1 9 0xf04>; @@ -264,6 +264,7 @@ amba: amba { compatible = "simple-bus"; + u-boot,dm-pre-reloc; #address-cells = <2>; #size-cells = <1>; ranges = <0 0 0 0 0xffffffff>; @@ -674,6 +675,7 @@ }; sdhci0: sdhci@ff160000 { + u-boot,dm-pre-reloc; compatible = "arasan,sdhci-8.9a"; status = "disabled"; interrupt-parent = <&gic>; @@ -685,6 +687,7 @@ }; sdhci1: sdhci@ff170000 { + u-boot,dm-pre-reloc; compatible = "arasan,sdhci-8.9a"; status = "disabled"; interrupt-parent = <&gic>; @@ -776,6 +779,7 @@ }; uart0: serial@ff000000 { + u-boot,dm-pre-reloc; compatible = "cdns,uart-r1p12", "xlnx,xuartps"; status = "disabled"; interrupt-parent = <&gic>; @@ -786,6 +790,7 @@ }; uart1: serial@ff010000 { + u-boot,dm-pre-reloc; compatible = "cdns,uart-r1p12", "xlnx,xuartps"; status = "disabled"; interrupt-parent = <&gic>; |