diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-07-23 22:34:17 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-07-23 22:34:17 +0200 |
| commit | 55be3cf836ff295efe8968710654a31e18b88a28 (patch) | |
| tree | 941e710dcbcdf6398c4140c0440a541c610564b8 /arch/arm/boot/dts | |
| parent | f8a2a45320da54cbcb45ab8d1764a30059338eaf (diff) | |
| parent | e0a5c552caf7a4865f3d5aa077003ef2d35217db (diff) | |
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>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/zynq-7000.dtsi | 18 |
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"; |