diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-27 15:05:12 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-27 15:05:12 -0500 |
| commit | 19bde0316f2c58b3ab6357832790aee6ed7a4ad5 (patch) | |
| tree | 8216f416e21cf71745abaec2c5a42ab9824b290e /arch/arm/dts/zynqmp.dtsi | |
| parent | b20c38a973a51bf3f663bd298c63ad1b8e0de445 (diff) | |
| parent | f36919a8138ed7ecd3dbce4630e02936b13907da (diff) | |
| download | talos-obmc-uboot-19bde0316f2c58b3ab6357832790aee6ed7a4ad5.tar.gz talos-obmc-uboot-19bde0316f2c58b3ab6357832790aee6ed7a4ad5.zip | |
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi index 24a34e6d85..8733604a57 100644 --- a/arch/arm/dts/zynqmp.dtsi +++ b/arch/arm/dts/zynqmp.dtsi @@ -520,7 +520,7 @@ }; uart0: serial@ff000000 { - compatible = "cdns,uart-r1p8"; + compatible = "cdns,uart-r1p12"; status = "disabled"; interrupt-parent = <&gic>; interrupts = <0 21 4>; @@ -529,7 +529,7 @@ }; uart1: serial@ff010000 { - compatible = "cdns,uart-r1p8"; + compatible = "cdns,uart-r1p12"; status = "disabled"; interrupt-parent = <&gic>; interrupts = <0 22 4>; @@ -559,7 +559,7 @@ compatible = "cdns,wdt-r1p2"; status = "disabled"; interrupt-parent = <&gic>; - interrupts = <0 52 1>; + interrupts = <0 113 1>; reg = <0x0 0xfd4d0000 0x1000>; timeout-sec = <10>; }; |
