diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 16:48:36 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 16:48:36 +0100 |
commit | f3507cc5865bddc5b690cd5991c3d6a151846905 (patch) | |
tree | a25872b69ba93a344c0a1990266eb8f7feef6bfe /arch/arm/boot/dts/zynq-zed.dts | |
parent | e44cfd469bed0ccf0811c5b160f862b6958923f4 (diff) | |
parent | 7b01abb06c997e5431cdfc62267449aaef1d77c7 (diff) |
Merge tag 'zynq-dt-for-3.19' of https://github.com/Xilinx/linux-xlnx into next/dt
Pull "arm: Xilinx Zynq dt patches for v3.19" from Michal Simek:
- Declare Digilent and vendor
- Add Zybo board support
- Fix VDMA documentation to be align with the driver
* tag 'zynq-dt-for-3.19' of https://github.com/Xilinx/linux-xlnx:
arm: dts: zynq: Add Digilent ZYBO board
arm: dts: zynq: Move crystal freq. to board level
doc: dt: vendor-prefixes: Add Digilent Inc
Documentation: devicetree: Fix Xilinx VDMA specification
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/zynq-zed.dts')
-rw-r--r-- | arch/arm/boot/dts/zynq-zed.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts index 697779a353e..1c7cc990b47 100644 --- a/arch/arm/boot/dts/zynq-zed.dts +++ b/arch/arm/boot/dts/zynq-zed.dts @@ -29,6 +29,10 @@ }; +&clkc { + ps-clk-frequency = <33333333>; +}; + &gem0 { status = "okay"; phy-mode = "rgmii-id"; |