Commit 77955664 authored by Bernd Schmidt's avatar Bernd Schmidt Committed by Bryan Wu
Browse files

[Blackfin] arch: Give the DMA base registers a more descriptive name 



The DMA base registers are available in a global named "base_addr" for
every Blackfin variant. Give this a more descriptive name, and remove
duplicate tables from some drivers.

Signed-off-by: default avatarBernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent ac86a978

arch/blackfin/kernel/bfin_dma_5xx.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int __init blackfin_dma_init(void) 


	for (i = 0; i < MAX_BLACKFIN_DMA_CHANNEL; i++) {

		dma_ch[i].chan_status = DMA_CHANNEL_FREE;

		dma_ch[i].regs = base_addr[i];

		dma_ch[i].regs = dma_io_base_addr[i];

		mutex_init(&(dma_ch[i].dmalock));

	}

	/* Mark MEMDMA Channel 0 as requested since we're using it internally */

arch/blackfin/mach-bf527/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <asm/blackfin.h>

#include <asm/dma.h>



struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {

struct dma_register *dma_io_base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {

	(struct dma_register *) DMA0_NEXT_DESC_PTR,

	(struct dma_register *) DMA1_NEXT_DESC_PTR,

	(struct dma_register *) DMA2_NEXT_DESC_PTR,
@@ -49,7 +49,7 @@ struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = { 
	(struct dma_register *) MDMA_D1_NEXT_DESC_PTR,

	(struct dma_register *) MDMA_S1_NEXT_DESC_PTR,

};

EXPORT_SYMBOL(base_addr);

EXPORT_SYMBOL(dma_io_base_addr);



int channel2irq(unsigned int channel)

{

arch/blackfin/mach-bf533/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <asm/blackfin.h>

#include <asm/dma.h>



struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {

struct dma_register *dma_io_base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {

	(struct dma_register *) DMA0_NEXT_DESC_PTR,

	(struct dma_register *) DMA1_NEXT_DESC_PTR,

	(struct dma_register *) DMA2_NEXT_DESC_PTR,
@@ -45,7 +45,7 @@ struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = { 
	(struct dma_register *) MDMA_D1_NEXT_DESC_PTR,

	(struct dma_register *) MDMA_S1_NEXT_DESC_PTR,

};

EXPORT_SYMBOL(base_addr);

EXPORT_SYMBOL(dma_io_base_addr);



int channel2irq(unsigned int channel)

{

arch/blackfin/mach-bf537/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <asm/blackfin.h>

#include <asm/dma.h>



struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {

struct dma_register *dma_io_base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {

	(struct dma_register *) DMA0_NEXT_DESC_PTR,

	(struct dma_register *) DMA1_NEXT_DESC_PTR,

	(struct dma_register *) DMA2_NEXT_DESC_PTR,
@@ -49,7 +49,7 @@ struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = { 
	(struct dma_register *) MDMA_D1_NEXT_DESC_PTR,

	(struct dma_register *) MDMA_S1_NEXT_DESC_PTR,

};

EXPORT_SYMBOL(base_addr);

EXPORT_SYMBOL(dma_io_base_addr);



int channel2irq(unsigned int channel)

{

arch/blackfin/mach-bf548/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <asm/blackfin.h>

#include <asm/dma.h>



struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {

struct dma_register *dma_io_base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {

	(struct dma_register *) DMA0_NEXT_DESC_PTR,

	(struct dma_register *) DMA1_NEXT_DESC_PTR,

	(struct dma_register *) DMA2_NEXT_DESC_PTR,
@@ -66,7 +66,7 @@ struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = { 
	(struct dma_register *) MDMA_D3_NEXT_DESC_PTR,

	(struct dma_register *) MDMA_S3_NEXT_DESC_PTR,

};

EXPORT_SYMBOL(base_addr);

EXPORT_SYMBOL(dma_io_base_addr);



int channel2irq(unsigned int channel)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE