Merge branch 'topic/bcm' into for-linus (95c4dc7b) · Commits · 戴 / test

Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt

+26 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,10 @@ Required properties:
		- reg: Should contain DMA registers location and length.
		- interrupts: Should contain the DMA interrupts associated
		to the DMA channels in ascending order.
		- interrupt-names: Should contain the names of the interrupt
		in the form "dmaXX".
		Use "dma-shared-all" for the common interrupt line
		that is shared by all dma channels.
		- #dma-cells: Must be <1>, the cell in the dmas property of the
		client device represents the DREQ number.
		- brcm,dma-channel-mask: Bit mask representing the channels
		@@ -34,13 +38,35 @@ dma: dma@7e007000 {
		<1 24>,
		<1 25>,
		<1 26>,
		/* dma channel 11-14 share one irq */
		<1 27>,
		<1 27>,
		<1 27>,
		<1 27>,
		/* unused shared irq for all channels */
		<1 28>;
		interrupt-names = "dma0",
		"dma1",
		"dma2",
		"dma3",
		"dma4",
		"dma5",
		"dma6",
		"dma7",
		"dma8",
		"dma9",
		"dma10",
		"dma11",
		"dma12",
		"dma13",
		"dma14",
		"dma-shared-all";

		#dma-cells = <1>;
		brcm,dma-channel-mask = <0x7f35>;
		};


		DMA clients connected to the BCM2835 DMA controller must use the format
		described in the dma.txt file, using a two-cell specifier for each channel.

+21 −1

Original line number	Diff line number	Diff line
		@@ -47,9 +47,29 @@
		<1 24>,
		<1 25>,
		<1 26>,
		/* dma channel 11-14 share one irq */
		<1 27>,
		<1 27>,
		<1 27>,
		<1 27>,
		/* unused shared irq for all channels */
		<1 28>;

		interrupt-names = "dma0",
		"dma1",
		"dma2",
		"dma3",
		"dma4",
		"dma5",
		"dma6",
		"dma7",
		"dma8",
		"dma9",
		"dma10",
		"dma11",
		"dma12",
		"dma13",
		"dma14",
		"dma-shared-all";
		#dma-cells = <1>;
		brcm,dma-channel-mask = <0x7f35>;
		};

+474 −130

File changed.

Preview size limit exceeded, changes collapsed.