diff options
author | Mike Frysinger <vapier@gentoo.org> | 2011-06-26 13:00:55 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-07-23 01:18:25 -0400 |
commit | b69c920cb11dde488239e6a4ea7f668983d628ac (patch) | |
tree | 3ed2f77ee7a1e8c901d9bbb6998944ddea62132a | |
parent | b0759a4d233107b8f693c0834d4cb917d7fb3a7d (diff) |
Blackfin: bf54x: tweak MMR pint names
The hardware block uses the name "request" rather than "irq", so update
the struct accordingly.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r-- | arch/blackfin/kernel/debug-mmrs.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/include/mach/irq.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/debug-mmrs.c b/arch/blackfin/kernel/debug-mmrs.c index c40dd6bbeac2..3ae029654650 100644 --- a/arch/blackfin/kernel/debug-mmrs.c +++ b/arch/blackfin/kernel/debug-mmrs.c | |||
@@ -1848,7 +1848,7 @@ static int __init bfin_debug_mmrs_init(void) | |||
1848 | _buf = REGS_STR_PFX(buf, PINT, num); | 1848 | _buf = REGS_STR_PFX(buf, PINT, num); |
1849 | __PINT(MASK_SET, mask_set); | 1849 | __PINT(MASK_SET, mask_set); |
1850 | __PINT(MASK_CLEAR, mask_clear); | 1850 | __PINT(MASK_CLEAR, mask_clear); |
1851 | __PINT(IRQ, irq); | 1851 | __PINT(REQUEST, request); |
1852 | __PINT(ASSIGN, assign); | 1852 | __PINT(ASSIGN, assign); |
1853 | __PINT(EDGE_SET, edge_set); | 1853 | __PINT(EDGE_SET, edge_set); |
1854 | __PINT(EDGE_CLEAR, edge_clear); | 1854 | __PINT(EDGE_CLEAR, edge_clear); |
diff --git a/arch/blackfin/mach-bf548/include/mach/irq.h b/arch/blackfin/mach-bf548/include/mach/irq.h index 533b8095b540..10dc142c518d 100644 --- a/arch/blackfin/mach-bf548/include/mach/irq.h +++ b/arch/blackfin/mach-bf548/include/mach/irq.h | |||
@@ -438,7 +438,7 @@ | |||
438 | struct bfin_pint_regs { | 438 | struct bfin_pint_regs { |
439 | u32 mask_set; | 439 | u32 mask_set; |
440 | u32 mask_clear; | 440 | u32 mask_clear; |
441 | u32 irq; | 441 | u32 request; |
442 | u32 assign; | 442 | u32 assign; |
443 | u32 edge_set; | 443 | u32 edge_set; |
444 | u32 edge_clear; | 444 | u32 edge_clear; |