Merge tag 'zynq-dt-for-3.17-2' of git://git.xilinx.com/linux-xlnx into next/dt

Merge "arm: Xilinx Zynq dt patches for v3.17 second pull request" from Michal Simek:

- Add GPIO and XADC node to dtsi

* tag 'zynq-dt-for-3.17-2' of git://git.xilinx.com/linux-xlnx:
  ARM: zynq: DT: Add GPIO node
  ARM: zynq: DT: Add XADC node

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 18 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index 029cbac30454..366ca6434f54 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -65,6 +65,24 @@
                 interrupt-parent = <&intc>;
                 ranges;
 
+                adc@f8007100 {
+                        compatible = "xlnx,zynq-xadc-1.00.a";
+                        reg = <0xf8007100 0x20>;
+                        interrupts = <0 7 4>;
+                        interrupt-parent = <&intc>;
+                        clocks = <&clkc 12>;
+                }; 
+
+                gpio0: gpio@e000a000 {
+                        compatible = "xlnx,zynq-gpio-1.0";
+                        #gpio-cells = <2>;
+                        clocks = <&clkc 42>;
+                        gpio-controller;
+                        interrupt-parent = <&intc>;
+                        interrupts = <0 20 4>;
+                        reg = <0xe000a000 0x1000>;
+                };
+
                 i2c0: i2c@e0004000 {
                         compatible = "cdns,i2c-r1p10";
                         status = "disabled";