diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2014-05-16 15:17:19 +0300 | 
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2014-05-22 14:55:23 +0530 | 
| commit | d5fc0e8dd9b3ddc26374d5334455c38ad84b7fab (patch) | |
| tree | 27d2f7c648723458bdc449e235daafb16e992332 /arch | |
| parent | 27f12c5bc3d7368bb62a66a2d79b5f862372057f (diff) | |
| download | linux-d5fc0e8dd9b3ddc26374d5334455c38ad84b7fab.tar.bz2 | |
ARM: davinci: Remove redundant/unused parameters for edma
The following parameters are no longer needed by the edma driver since the
information can be obtained from the IP's CCCFG register:
n_channel, n_region, n_slot and n_tc.
Remove the initialization of n_cc as well since in this context it has no
meaning. We have separate edma_soc_info struct/eDMA3_CC instance so this
member does not make any sense (and the driver no longer uses it).
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-davinci/devices-da8xx.c | 15 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/dm355.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/dm365.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/dm644x.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/dm646x.c | 5 | 
5 files changed, 0 insertions, 35 deletions
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 7f376e54b266..b85b781b05fd 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -148,11 +148,6 @@ static s8 da850_queue_priority_mapping[][2] = {  };  static struct edma_soc_info da830_edma_cc0_info = { -	.n_channel		= 32, -	.n_region		= 4, -	.n_slot			= 128, -	.n_tc			= 2, -	.n_cc			= 1,  	.queue_priority_mapping	= da8xx_queue_priority_mapping,  	.default_queue		= EVENTQ_1,  }; @@ -163,20 +158,10 @@ static struct edma_soc_info *da830_edma_info[EDMA_MAX_CC] = {  static struct edma_soc_info da850_edma_cc_info[] = {  	{ -		.n_channel		= 32, -		.n_region		= 4, -		.n_slot			= 128, -		.n_tc			= 2, -		.n_cc			= 1,  		.queue_priority_mapping	= da8xx_queue_priority_mapping,  		.default_queue		= EVENTQ_1,  	},  	{ -		.n_channel		= 32, -		.n_region		= 4, -		.n_slot			= 128, -		.n_tc			= 1, -		.n_cc			= 1,  		.queue_priority_mapping	= da850_queue_priority_mapping,  		.default_queue		= EVENTQ_0,  	}, diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index e27f7ff54570..2f3ed3a58d57 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -577,11 +577,6 @@ queue_priority_mapping[][2] = {  };  static struct edma_soc_info edma_cc0_info = { -	.n_channel		= 64, -	.n_region		= 4, -	.n_slot			= 128, -	.n_tc			= 2, -	.n_cc			= 1,  	.queue_priority_mapping	= queue_priority_mapping,  	.default_queue		= EVENTQ_1,  }; diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 88835b0aaead..0ae8114f5cc9 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -863,11 +863,6 @@ dm365_queue_priority_mapping[][2] = {  };  static struct edma_soc_info edma_cc0_info = { -	.n_channel		= 64, -	.n_region		= 4, -	.n_slot			= 256, -	.n_tc			= 4, -	.n_cc			= 1,  	.queue_priority_mapping	= dm365_queue_priority_mapping,  	.default_queue		= EVENTQ_3,  }; diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 8ea34be879b4..dc52657909c4 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -507,11 +507,6 @@ queue_priority_mapping[][2] = {  };  static struct edma_soc_info edma_cc0_info = { -	.n_channel		= 64, -	.n_region		= 4, -	.n_slot			= 128, -	.n_tc			= 2, -	.n_cc			= 1,  	.queue_priority_mapping	= queue_priority_mapping,  	.default_queue		= EVENTQ_1,  }; diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 97e90dc5ed43..6c3bbea7d77d 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -543,11 +543,6 @@ dm646x_queue_priority_mapping[][2] = {  };  static struct edma_soc_info edma_cc0_info = { -	.n_channel		= 64, -	.n_region		= 6,	/* 0-1, 4-7 */ -	.n_slot			= 512, -	.n_tc			= 4, -	.n_cc			= 1,  	.queue_priority_mapping	= dm646x_queue_priority_mapping,  	.default_queue		= EVENTQ_1,  };  |