Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-drm-fsl-dcu.git] / arch / sh / boards / shmin / setup.c

diff --git a/arch/sh/boards/shmin/setup.c b/arch/sh/boards/shmin/setup.c
index a31a1d1e2681f06e16dff61cf2eef069977949ab..4a9df4a6b034d2f3cfe4013d3c2e4fea4e8dc711 100644 (file)
--- a/arch/sh/boards/shmin/setup.c
+++ b/arch/sh/boards/shmin/setup.c
@@ -12,12 +12,22 @@
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#define PFC_PHCR       0xa400010e
+#define PFC_PHCR       0xa400010eUL
+#define INTC_ICR1      0xa4000010UL
+#define INTC_IPRC      0xa4000016UL
+
+static struct ipr_data shmin_ipr_map[] = {
+       { .irq=32, .addr=INTC_IPRC, .shift= 0, .priority=0 },
+       { .irq=33, .addr=INTC_IPRC, .shift= 4, .priority=0 },
+       { .irq=34, .addr=INTC_IPRC, .shift= 8, .priority=8 },
+       { .irq=35, .addr=INTC_IPRC, .shift=12, .priority=0 },
+};
 
 static void __init init_shmin_irq(void)
 {
        ctrl_outw(0x2a00, PFC_PHCR);    // IRQ0-3=IRQ
        ctrl_outw(0x0aaa, INTC_ICR1);   // IRQ0-3=IRQ-mode,Low-active.
+       make_ipr_irq(shmin_ipr_map, ARRAY_SIZE(shmin_ipr_map));
 }
 
 static void __iomem *shmin_ioport_map(unsigned long port, unsigned int size)