Commit f3507cc5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents e44cfd46 7b01abb0

Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ Required child node properties: 
- compatible: It should be either "xlnx,axi-vdma-mm2s-channel" or

	"xlnx,axi-vdma-s2mm-channel".

- interrupts: Should contain per channel VDMA interrupts.

- xlnx,data-width: Should contain the stream data width, take values

- xlnx,datawidth: Should contain the stream data width, take values

	{32,64...1024}.



Optional child node properties:

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ dallas Maxim Integrated Products (formerly Dallas Semiconductor) 
davicom	DAVICOM Semiconductor, Inc.

denx	Denx Software Engineering

digi	Digi International Inc.

digilent	Diglent, Inc.

dlg	Dialog Semiconductor

dlink	D-Link Corporation

dmo	Data Modul AG

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -515,7 +515,8 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \ 
	zynq-parallella.dtb \

	zynq-zc702.dtb \

	zynq-zc706.dtb \

	zynq-zed.dtb

	zynq-zed.dtb \

	zynq-zybo.dtb

dtb-$(CONFIG_MACH_ARMADA_370) += \

	armada-370-db.dtb \

	armada-370-mirabox.dtb \

arch/arm/boot/dts/zynq-7000.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -243,7 +243,6 @@ 
			clkc: clkc@100 {

				#clock-cells = <1>;

				compatible = "xlnx,ps7-clkc";

				ps-clk-frequency = <33333333>;

				fclk-enable = <0>;

				clock-output-names = "armpll", "ddrpll", "iopll", "cpu_6or4x",

						"cpu_3or2x", "cpu_2x", "cpu_1x", "ddr2x", "ddr3x",

arch/arm/boot/dts/zynq-parallella.dts

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ 
	};

};



&clkc {

	ps-clk-frequency = <33333333>;

};



&gem0 {

	status = "okay";

	phy-mode = "rgmii-id";

CRA Git | Maintained and supported by SUSTech CRA and CCSE