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>

diff --git a/arch/blackfin/kernel/debug-mmrs.c b/arch/blackfin/kernel/debug-mmrs.c
index c40dd6bbeac2aceb34d98aa31223e7790b6dcec6..3ae029654650b5d0ee809648cca543b0d64f1fe2 100644 (file)
--- 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)
                        _buf = REGS_STR_PFX(buf, PINT, num);
                        __PINT(MASK_SET, mask_set);
                        __PINT(MASK_CLEAR, mask_clear);
-                       __PINT(IRQ, irq);
+                       __PINT(REQUEST, request);
                        __PINT(ASSIGN, assign);
                        __PINT(EDGE_SET, edge_set);
                        __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 533b8095b540aec5950f3d44df16914c71a2b2ad..10dc142c518d538db8c7154eb47ad36958ea63e8 100644 (file)
--- a/arch/blackfin/mach-bf548/include/mach/irq.h
+++ b/arch/blackfin/mach-bf548/include/mach/irq.h
@@ -438,7 +438,7 @@
 struct bfin_pint_regs {
        u32 mask_set;
        u32 mask_clear;
-       u32 irq;
+       u32 request;
        u32 assign;
        u32 edge_set;
        u32 edge_clear;