Merge branch 'topic/edma' into for-linus

Required properties:

Required properties:

- compatible:	"ti,dra7-dma-crossbar" for DRA7xx DMA crossbar

- compatible:	"ti,dra7-dma-crossbar" for DRA7xx DMA crossbar

		"ti,am335x-edma-crossbar" for AM335x and AM437x

- reg:		Memory map for accessing module

- reg:		Memory map for accessing module

- #dma-cells:	Should be set to <1>.

- #dma-cells:	Should be set to to match with the DMA controller's dma-cells

		Clients should use the crossbar request number (input)

		for ti,dra7-dma-crossbar and <3> for ti,am335x-edma-crossbar.

- dma-requests:	Number of DMA requests the crossbar can receive

- dma-requests:	Number of DMA requests the crossbar can receive

- dma-masters:	phandle pointing to the DMA controller

- dma-masters:	phandle pointing to the DMA controller

Optional properties:

Optional properties:

- ti,dma-safe-map: Safe routing value for unused request lines

- ti,dma-safe-map: Safe routing value for unused request lines

Notes:

When requesting channel via ti,dra7-dma-crossbar, the DMA clinet must request

the DMA event number as crossbar ID (input to the DMA crossbar).

For ti,am335x-edma-crossbar: the meaning of parameters of dmas for clients:

dmas = <&edma_xbar 12 0 1>; where <12> is the DMA request number, <0> is the TC

the event should be assigned and <1> is the mux selection for in the crossbar.

When mux 0 is used the DMA channel can be requested directly from edma node.

Example:

Example:

/* DMA controller */

/* DMA controller */

	ti,hwmods = "uart1";

	ti,hwmods = "uart1";

	clock-frequency = <48000000>;

	clock-frequency = <48000000>;

	status = "disabled";

	status = "disabled";

	/* Requesting crossbar input 49 and 50 */

	dmas = <&sdma_xbar 49>, <&sdma_xbar 50>;

	dmas = <&sdma_xbar 49>, <&sdma_xbar 50>;

	dma-names = "tx", "rx";

	dma-names = "tx", "rx";

};

};

TI EDMA

Texas Instruments eDMA

The eDMA3 consists of two components: Channel controller (CC) and Transfer

Controller(s) (TC). The CC is the main entry for DMA users since it is

responsible for the DMA channel handling, while the TCs are responsible to

execute the actual DMA tansfer.

------------------------------------------------------------------------------

eDMA3 Channel Controller

Required properties:

- compatible:	"ti,edma3-tpcc" for the channel controller(s)

- #dma-cells:	Should be set to <2>. The first number is the DMA request

		number and the second is the TC the channel is serviced on.

- reg:		Memory map of eDMA CC

- reg-names:	"edma3_cc"

- interrupts:	Interrupt lines for CCINT, MPERR and CCERRINT.

- interrupt-names: "edma3_ccint", "emda3_mperr" and "edma3_ccerrint"

- ti,tptcs:	List of TPTCs associated with the eDMA in the following form:

		<&tptc_phandle TC_priority_number>. The highest priority is 0.

Optional properties:

- ti,hwmods:	Name of the hwmods associated to the eDMA CC

- ti,edma-memcpy-channels: List of channels allocated to be used for memcpy, iow

		these channels will be SW triggered channels. The list must

		contain 16 bits numbers, see example.

- ti,edma-reserved-slot-ranges: PaRAM slot ranges which should not be used by

		the driver, they are allocated to be used by for example the

		DSP. See example.

------------------------------------------------------------------------------

eDMA3 Transfer Controller

Required properties:

- compatible:	"ti,edma3-tptc" for the transfer controller(s)

- reg:		Memory map of eDMA TC

- interrupts:	Interrupt number for TCerrint.

Optional properties:

- ti,hwmods:	Name of the hwmods associated to the given eDMA TC

- interrupt-names: "edma3_tcerrint"

------------------------------------------------------------------------------

Example:

edma: edma@49000000 {

	compatible = "ti,edma3-tpcc";

	ti,hwmods = "tpcc";

	reg =	<0x49000000 0x10000>;

	reg-names = "edma3_cc";

	interrupts = <12 13 14>;

	interrupt-names = "edma3_ccint", "emda3_mperr", "edma3_ccerrint";

	dma-requests = <64>;

	#dma-cells = <2>;

	ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 7>, <&edma_tptc2 0>;

	/* Channel 20 and 21 is allocated for memcpy */

	ti,edma-memcpy-channels = /bits/ 16 <20 21>;

	/* The following PaRAM slots are reserved: 35-45 and 100-110 */

	ti,edma-reserved-slot-ranges = /bits/ 16 <35 10>,

				       /bits/ 16 <100 10>;

};

edma_tptc0: tptc@49800000 {

	compatible = "ti,edma3-tptc";

	ti,hwmods = "tptc0";

	reg =	<0x49800000 0x100000>;

	interrupts = <112>;

	interrupt-names = "edm3_tcerrint";

};

edma_tptc1: tptc@49900000 {

	compatible = "ti,edma3-tptc";

	ti,hwmods = "tptc1";

	reg =	<0x49900000 0x100000>;

	interrupts = <113>;

	interrupt-names = "edm3_tcerrint";

};

edma_tptc2: tptc@49a00000 {

	compatible = "ti,edma3-tptc";

	ti,hwmods = "tptc2";

	reg =	<0x49a00000 0x100000>;

	interrupts = <114>;

	interrupt-names = "edm3_tcerrint";

};

sham: sham@53100000 {

	compatible = "ti,omap4-sham";

	ti,hwmods = "sham";

	reg = <0x53100000 0x200>;

	interrupts = <109>;

	/* DMA channel 36 executed on eDMA TC0 - low priority queue */

	dmas = <&edma 36 0>;

	dma-names = "rx";

};

mcasp0: mcasp@48038000 {

	compatible = "ti,am33xx-mcasp-audio";

	ti,hwmods = "mcasp0";

	reg = <0x48038000 0x2000>,

		<0x46000000 0x400000>;

	reg-names = "mpu", "dat";

	interrupts = <80>, <81>;

	interrupt-names = "tx", "rx";

	status = "disabled";

	/* DMA channels 8 and 9 executed on eDMA TC2 - high priority queue */

	dmas = <&edma 8 2>,

	       <&edma 9 2>;

	dma-names = "tx", "rx";

};

------------------------------------------------------------------------------

DEPRECATED binding, new DTS files must use the ti,edma3-tpcc/ti,edma3-tptc

binding.

Required properties:

Required properties:

- compatible : "ti,edma3"

- compatible : "ti,edma3"

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select GENERIC_IRQ_CHIP

	select HAVE_IDE

	select HAVE_IDE

	select TI_PRIV_EDMA

	select USE_OF

	select USE_OF

	select ZONE_DMA

	select ZONE_DMA

	help

	help

&mmc3 {

&mmc3 {

	/* these are on the crossbar and are outlined in the

	/* these are on the crossbar and are outlined in the

	   xbar-event-map element */

	   xbar-event-map element */

	dmas = <&edma 12

	dmas = <&edma_xbar 12 0 1

		&edma 13>;

		&edma_xbar 13 0 2>;

	dma-names = "tx", "rx";

	dma-names = "tx", "rx";

	status = "okay";

	status = "okay";

	vmmc-supply = <&wlan_en_reg>;

	vmmc-supply = <&wlan_en_reg>;

	};

	};

};

};

&edma {

	ti,edma-xbar-event-map = /bits/ 16 <1 12

					    2 13>;

};

&sham {

&sham {

	status = "okay";

	status = "okay";

};

};

	ti,non-removable;

	ti,non-removable;

};

};

&edma {

	/* Map eDMA MMC2 Events from Crossbar */

	ti,edma-xbar-event-map = /bits/ 16 <1 12

                                            2 13>;

};

&mmc3 {

&mmc3 {

	/* Wifi & Bluetooth on MMC #3 */

	/* Wifi & Bluetooth on MMC #3 */

	status = "okay";

	status = "okay";

	vmmmc-supply = <&v3v3c_reg>;

	vmmmc-supply = <&v3v3c_reg>;

	bus-width = <4>;

	bus-width = <4>;

	ti,non-removable;

	ti,non-removable;

	dmas = <&edma 12

	dmas = <&edma_xbar 12 0 1

		&edma 13>;

		&edma_xbar 13 0 2>;

	dma-names = "tx", "rx";

	dma-names = "tx", "rx";

};

};