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

Commit 9be6eb41 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'davinci/cleanup' into next/cleanup

parents 967d5cef 902532db

arch/arm/mach-davinci/devices-da8xx.c

+3 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ static struct edma_soc_info da830_edma_cc0_info = { 
	.n_cc			= 1,

	.queue_tc_mapping	= da8xx_queue_tc_mapping,

	.queue_priority_mapping	= da8xx_queue_priority_mapping,

	.default_queue		= EVENTQ_1,

};



static struct edma_soc_info *da830_edma_info[EDMA_MAX_CC] = {
@@ -151,6 +152,7 @@ static struct edma_soc_info da850_edma_cc_info[] = { 
		.n_cc			= 1,

		.queue_tc_mapping	= da8xx_queue_tc_mapping,

		.queue_priority_mapping	= da8xx_queue_priority_mapping,

		.default_queue		= EVENTQ_1,

	},

	{

		.n_channel		= 32,
@@ -160,6 +162,7 @@ static struct edma_soc_info da850_edma_cc_info[] = { 
		.n_cc			= 1,

		.queue_tc_mapping	= da850_queue_tc_mapping,

		.queue_priority_mapping	= da850_queue_priority_mapping,

		.default_queue		= EVENTQ_0,

	},

};

arch/arm/mach-davinci/devices-tnetv107x.c

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static struct edma_soc_info edma_cc0_info = { 
	.n_cc			= 1,

	.queue_tc_mapping	= edma_tc_mapping,

	.queue_priority_mapping	= edma_priority_mapping,

	.default_queue		= EVENTQ_1,

};



static struct edma_soc_info *tnetv107x_edma_info[EDMA_MAX_CC] = {

arch/arm/mach-davinci/dm355.c

+1 −0
Original line number Diff line number Diff line
@@ -591,6 +591,7 @@ static struct edma_soc_info edma_cc0_info = { 
	.n_cc			= 1,

	.queue_tc_mapping	= queue_tc_mapping,

	.queue_priority_mapping	= queue_priority_mapping,

	.default_queue		= EVENTQ_1,

};



static struct edma_soc_info *dm355_edma_info[EDMA_MAX_CC] = {

arch/arm/mach-davinci/dm644x.c

+1 −0
Original line number Diff line number Diff line
@@ -514,6 +514,7 @@ static struct edma_soc_info edma_cc0_info = { 
	.n_cc			= 1,

	.queue_tc_mapping	= queue_tc_mapping,

	.queue_priority_mapping	= queue_priority_mapping,

	.default_queue		= EVENTQ_1,

};



static struct edma_soc_info *dm644x_edma_info[EDMA_MAX_CC] = {

arch/arm/mach-davinci/dm646x.c

+1 −0
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ static struct edma_soc_info edma_cc0_info = { 
	.n_cc			= 1,

	.queue_tc_mapping	= dm646x_queue_tc_mapping,

	.queue_priority_mapping	= dm646x_queue_priority_mapping,

	.default_queue		= EVENTQ_1,

};



static struct edma_soc_info *dm646x_edma_info[EDMA_MAX_CC] = {