diff options
-rw-r--r-- | arch/cris/arch-v32/mach-a3/arbiter.c | 6 | ||||
-rw-r--r-- | arch/cris/arch-v32/mach-a3/dma.c | 2 | ||||
-rw-r--r-- | include/asm-cris/arch-v32/mach-a3/arbiter.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/cris/arch-v32/mach-a3/arbiter.c b/arch/cris/arch-v32/mach-a3/arbiter.c index b92fd7eed3c4..8b924db71c9a 100644 --- a/arch/cris/arch-v32/mach-a3/arbiter.c +++ b/arch/cris/arch-v32/mach-a3/arbiter.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * arbiter and sets up arbiter breakpoints. | 3 | * arbiter and sets up arbiter breakpoints. |
4 | * | 4 | * |
5 | * The algorithm first assigns slots to the clients that has specified | 5 | * The algorithm first assigns slots to the clients that has specified |
6 | * bandwith (e.g. ethernet) and then the remaining slots are divided | 6 | * bandwidth (e.g. ethernet) and then the remaining slots are divided |
7 | * on all the active clients. | 7 | * on all the active clients. |
8 | * | 8 | * |
9 | * Copyright (c) 2004-2007 Axis Communications AB. | 9 | * Copyright (c) 2004-2007 Axis Communications AB. |
@@ -282,7 +282,7 @@ static void crisv32_arbiter_init(void) | |||
282 | REG_WR_INT(marb_bar, regi_marb_bar, rw_l2cache_burst, 3); | 282 | REG_WR_INT(marb_bar, regi_marb_bar, rw_l2cache_burst, 3); |
283 | } | 283 | } |
284 | 284 | ||
285 | int crisv32_arbiter_allocate_bandwith(int client, int region, | 285 | int crisv32_arbiter_allocate_bandwidth(int client, int region, |
286 | unsigned long bandwidth) | 286 | unsigned long bandwidth) |
287 | { | 287 | { |
288 | int i; | 288 | int i; |
@@ -324,7 +324,7 @@ int crisv32_arbiter_allocate_bandwith(int client, int region, | |||
324 | 324 | ||
325 | /* Propagate allocation from foo to bar */ | 325 | /* Propagate allocation from foo to bar */ |
326 | if (arbiter == 0) | 326 | if (arbiter == 0) |
327 | crisv32_arbiter_allocate_bandwith(8 << 16, | 327 | crisv32_arbiter_allocate_bandwidth(8 << 16, |
328 | EXT_REGION, bandwidth); | 328 | EXT_REGION, bandwidth); |
329 | return 0; | 329 | return 0; |
330 | } | 330 | } |
diff --git a/arch/cris/arch-v32/mach-a3/dma.c b/arch/cris/arch-v32/mach-a3/dma.c index 0c19fede0e65..25f236ef0b81 100644 --- a/arch/cris/arch-v32/mach-a3/dma.c +++ b/arch/cris/arch-v32/mach-a3/dma.c | |||
@@ -24,7 +24,7 @@ int crisv32_request_dma(unsigned int dmanr, const char *device_id, | |||
24 | reg_clkgen_rw_clk_ctrl clk_ctrl; | 24 | reg_clkgen_rw_clk_ctrl clk_ctrl; |
25 | reg_strmux_rw_cfg strmux_cfg; | 25 | reg_strmux_rw_cfg strmux_cfg; |
26 | 26 | ||
27 | if (crisv32_arbiter_allocate_bandwith(dmanr, | 27 | if (crisv32_arbiter_allocate_bandwidth(dmanr, |
28 | options & DMA_INT_MEM ? INT_REGION : EXT_REGION, | 28 | options & DMA_INT_MEM ? INT_REGION : EXT_REGION, |
29 | bandwidth)) | 29 | bandwidth)) |
30 | return -ENOMEM; | 30 | return -ENOMEM; |
diff --git a/include/asm-cris/arch-v32/mach-a3/arbiter.h b/include/asm-cris/arch-v32/mach-a3/arbiter.h index 50a89351e62b..65e9d6ff0520 100644 --- a/include/asm-cris/arch-v32/mach-a3/arbiter.h +++ b/include/asm-cris/arch-v32/mach-a3/arbiter.h | |||
@@ -24,7 +24,7 @@ enum { | |||
24 | 24 | ||
25 | #define MARB_CLIENTS(foo_cli, bar_cli) (((bar_cli) << 16) | (foo_cli)) | 25 | #define MARB_CLIENTS(foo_cli, bar_cli) (((bar_cli) << 16) | (foo_cli)) |
26 | 26 | ||
27 | int crisv32_arbiter_allocate_bandwith(int client, int region, | 27 | int crisv32_arbiter_allocate_bandwidth(int client, int region, |
28 | unsigned long bandwidth); | 28 | unsigned long bandwidth); |
29 | int crisv32_arbiter_watch(unsigned long start, unsigned long size, | 29 | int crisv32_arbiter_watch(unsigned long start, unsigned long size, |
30 | unsigned long clients, unsigned long accesses, | 30 | unsigned long clients, unsigned long accesses, |