Skip to content

Commit

Permalink
[ARM] add coherent DMA mask for mv643xx_eth
Browse files Browse the repository at this point in the history
Since commit eb0519b, mv643xx_eth is non functional on ARM because
the platform device declaration does not include any coherent DMA mask
and coherent memory allocations fail.

Signed-off-by: Nicolas Pitre <nico@marvell.com>
  • Loading branch information
Nicolas Pitre committed May 22, 2009
1 parent 85bc262 commit a49a018
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 0 deletions.
6 changes: 6 additions & 0 deletions arch/arm/mach-kirkwood/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ static struct platform_device kirkwood_ge00 = {
.id = 0,
.num_resources = 1,
.resource = kirkwood_ge00_resources,
.dev = {
.coherent_dma_mask = 0xffffffff,
},
};

void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data)
Expand Down Expand Up @@ -202,6 +205,9 @@ static struct platform_device kirkwood_ge01 = {
.id = 1,
.num_resources = 1,
.resource = kirkwood_ge01_resources,
.dev = {
.coherent_dma_mask = 0xffffffff,
},
};

void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data)
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/mach-loki/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ static struct platform_device loki_ge0 = {
.id = 0,
.num_resources = 1,
.resource = loki_ge0_resources,
.dev = {
.coherent_dma_mask = 0xffffffff,
},
};

void __init loki_ge0_init(struct mv643xx_eth_platform_data *eth_data)
Expand Down Expand Up @@ -136,6 +139,9 @@ static struct platform_device loki_ge1 = {
.id = 1,
.num_resources = 1,
.resource = loki_ge1_resources,
.dev = {
.coherent_dma_mask = 0xffffffff,
},
};

void __init loki_ge1_init(struct mv643xx_eth_platform_data *eth_data)
Expand Down
12 changes: 12 additions & 0 deletions arch/arm/mach-mv78xx0/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,9 @@ static struct platform_device mv78xx0_ge00 = {
.id = 0,
.num_resources = 1,
.resource = mv78xx0_ge00_resources,
.dev = {
.coherent_dma_mask = 0xffffffff,
},
};

void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)
Expand Down Expand Up @@ -375,6 +378,9 @@ static struct platform_device mv78xx0_ge01 = {
.id = 1,
.num_resources = 1,
.resource = mv78xx0_ge01_resources,
.dev = {
.coherent_dma_mask = 0xffffffff,
},
};

void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)
Expand Down Expand Up @@ -429,6 +435,9 @@ static struct platform_device mv78xx0_ge10 = {
.id = 2,
.num_resources = 1,
.resource = mv78xx0_ge10_resources,
.dev = {
.coherent_dma_mask = 0xffffffff,
},
};

void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)
Expand Down Expand Up @@ -496,6 +505,9 @@ static struct platform_device mv78xx0_ge11 = {
.id = 3,
.num_resources = 1,
.resource = mv78xx0_ge11_resources,
.dev = {
.coherent_dma_mask = 0xffffffff,
},
};

void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data)
Expand Down
3 changes: 3 additions & 0 deletions arch/arm/mach-orion5x/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,9 @@ static struct platform_device orion5x_eth = {
.id = 0,
.num_resources = 1,
.resource = orion5x_eth_resources,
.dev = {
.coherent_dma_mask = 0xffffffff,
},
};

void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)
Expand Down

0 comments on commit a49a018

Please sign in to comment.