diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-13 12:53:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-13 12:53:11 -0400 |
| commit | 541c9be880d601cb0230dc7452c398167ed1eaac (patch) | |
| tree | 0686261e2d2e4589c651d165026d4e678390915a /arch/arm/dts/zynq-7000.dtsi | |
| parent | 3f8085e94ae3e8a2996e2f517ecdb608a4b4c09e (diff) | |
| parent | 58ed7f66939cbfb6e48656b3925aefd9f180a1a3 (diff) | |
| download | talos-obmc-uboot-541c9be880d601cb0230dc7452c398167ed1eaac.tar.gz talos-obmc-uboot-541c9be880d601cb0230dc7452c398167ed1eaac.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm/dts/zynq-7000.dtsi')
| -rw-r--r-- | arch/arm/dts/zynq-7000.dtsi | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi index 2d786f0fd1..a327557c19 100644 --- a/arch/arm/dts/zynq-7000.dtsi +++ b/arch/arm/dts/zynq-7000.dtsi @@ -96,8 +96,10 @@ gpio0: gpio@e000a000 { compatible = "xlnx,zynq-gpio-1.0"; #gpio-cells = <2>; + #interrupt-cells = <2>; clocks = <&clkc 42>; gpio-controller; + interrupt-controller; interrupt-parent = <&intc>; interrupts = <0 20 4>; reg = <0xe000a000 0x1000>; @@ -270,6 +272,13 @@ reg = <0x100 0x100>; }; + rstc: rstc@200 { + compatible = "xlnx,zynq-reset"; + reg = <0x200 0x48>; + #reset-cells = <1>; + syscon = <&slcr>; + }; + pinctrl0: pinctrl@700 { compatible = "xlnx,pinctrl-zynq"; reg = <0x700 0x200>; @@ -297,7 +306,12 @@ devcfg: devcfg@f8007000 { compatible = "xlnx,zynq-devcfg-1.0"; + interrupt-parent = <&intc>; + interrupts = <0 8 4>; reg = <0xf8007000 0x100>; + clocks = <&clkc 12>, <&clkc 15>, <&clkc 16>, <&clkc 17>, <&clkc 18>; + clock-names = "ref_clk", "fclk0", "fclk1", "fclk2", "fclk3"; + syscon = <&slcr>; }; global_timer: timer@f8f00200 { |
