Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a8c271b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci... 

Merge branch 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical

* 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci:
  ARM: davinci: map default_queue to edma channels
parents d0cdd82c 0b7580ba

arch/arm/mach-davinci/dma.c

+1 −5
Original line number Diff line number Diff line
@@ -1508,12 +1508,8 @@ static int __init edma_probe(struct platform_device *pdev) 
			goto fail;

		}



		/* Everything lives on transfer controller 1 until otherwise

		 * specified. This way, long transfers on the low priority queue

		 * started by the codec engine will not cause audio defects.

		 */

		for (i = 0; i < edma_cc[j]->num_channels; i++)

			map_dmach_queue(j, i, EVENTQ_1);

			map_dmach_queue(j, i, info[j]->default_queue);



		queue_tc_mapping = info[j]->queue_tc_mapping;

		queue_priority_mapping = info[j]->queue_priority_mapping;

arch/arm/mach-davinci/include/mach/edma.h

+5 −0
Original line number Diff line number Diff line
@@ -250,6 +250,11 @@ struct edma_soc_info { 
	unsigned	n_slot;

	unsigned	n_tc;

	unsigned	n_cc;

	/*

	 * Default queue is expected to be a low-priority queue.

	 * This way, long transfers on the default queue started

	 * by the codec engine will not cause audio defects.

	 */

	enum dma_event_q	default_queue;



	/* Resource reservation for other cores */