tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
sh: multiple vectors per irq - sh7705.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
+20
-43
+20
-43
arch/sh/kernel/cpu/sh3/setup-sh7705.c
+20
-43
arch/sh/kernel/cpu/sh3/setup-sh7705.c
···
1
1
/*
2
2
* SH7705 Setup
3
3
*
4
-
* Copyright (C) 2006, 2007 Paul Mundt
4
+
* Copyright (C) 2006 - 2009 Paul Mundt
5
5
* Copyright (C) 2007 Nobuhiro Iwamatsu
6
6
*
7
7
* This file is subject to the terms and conditions of the GNU General Public
···
21
21
/* interrupt sources */
22
22
IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5,
23
23
PINT07, PINT815,
24
-
DMAC_DEI0, DMAC_DEI1, DMAC_DEI2, DMAC_DEI3,
25
-
SCIF0_ERI, SCIF0_RXI, SCIF0_TXI,
26
-
SCIF2_ERI, SCIF2_RXI, SCIF2_TXI,
27
-
ADC_ADI,
28
-
USB_USI0, USB_USI1,
29
-
TPU0, TPU1, TPU2, TPU3,
30
-
TMU0, TMU1, TMU2_TUNI, TMU2_TICPI,
31
-
RTC_ATI, RTC_PRI, RTC_CUI,
32
-
WDT,
33
-
REF_RCMI,
34
24
35
-
/* interrupt groups */
36
-
RTC, TMU2, DMAC, USB, SCIF2, SCIF0,
25
+
DMAC, SCIF0, SCIF2, ADC_ADI, USB,
26
+
27
+
TPU0, TPU1, TPU2, TPU3,
28
+
TMU0, TMU1, TMU2,
29
+
30
+
RTC, WDT, REF_RCMI,
37
31
};
38
32
39
33
static struct intc_vect vectors[] __initdata = {
40
34
/* IRQ0->5 are handled in setup-sh3.c */
41
35
INTC_VECT(PINT07, 0x700), INTC_VECT(PINT815, 0x720),
42
-
INTC_VECT(DMAC_DEI0, 0x800), INTC_VECT(DMAC_DEI1, 0x820),
43
-
INTC_VECT(DMAC_DEI2, 0x840), INTC_VECT(DMAC_DEI3, 0x860),
44
-
INTC_VECT(SCIF0_ERI, 0x880), INTC_VECT(SCIF0_RXI, 0x8a0),
45
-
INTC_VECT(SCIF0_TXI, 0x8e0),
46
-
INTC_VECT(SCIF2_ERI, 0x900), INTC_VECT(SCIF2_RXI, 0x920),
47
-
INTC_VECT(SCIF2_TXI, 0x960),
36
+
INTC_VECT(DMAC, 0x800), INTC_VECT(DMAC, 0x820),
37
+
INTC_VECT(DMAC, 0x840), INTC_VECT(DMAC, 0x860),
38
+
INTC_VECT(SCIF0, 0x880), INTC_VECT(SCIF0, 0x8a0),
39
+
INTC_VECT(SCIF0, 0x8e0),
40
+
INTC_VECT(SCIF2, 0x900), INTC_VECT(SCIF2, 0x920),
41
+
INTC_VECT(SCIF2, 0x960),
48
42
INTC_VECT(ADC_ADI, 0x980),
49
-
INTC_VECT(USB_USI0, 0xa20), INTC_VECT(USB_USI1, 0xa40),
43
+
INTC_VECT(USB, 0xa20), INTC_VECT(USB, 0xa40),
50
44
INTC_VECT(TPU0, 0xc00), INTC_VECT(TPU1, 0xc20),
51
45
INTC_VECT(TPU2, 0xc80), INTC_VECT(TPU3, 0xca0),
52
46
INTC_VECT(TMU0, 0x400), INTC_VECT(TMU1, 0x420),
53
-
INTC_VECT(TMU2_TUNI, 0x440), INTC_VECT(TMU2_TICPI, 0x460),
54
-
INTC_VECT(RTC_ATI, 0x480), INTC_VECT(RTC_PRI, 0x4a0),
55
-
INTC_VECT(RTC_CUI, 0x4c0),
47
+
INTC_VECT(TMU2, 0x440), INTC_VECT(TMU2, 0x460),
48
+
INTC_VECT(RTC, 0x480), INTC_VECT(RTC, 0x4a0),
49
+
INTC_VECT(RTC, 0x4c0),
56
50
INTC_VECT(WDT, 0x560),
57
51
INTC_VECT(REF_RCMI, 0x580),
58
-
};
59
-
60
-
static struct intc_group groups[] __initdata = {
61
-
INTC_GROUP(RTC, RTC_ATI, RTC_PRI, RTC_CUI),
62
-
INTC_GROUP(TMU2, TMU2_TUNI, TMU2_TICPI),
63
-
INTC_GROUP(DMAC, DMAC_DEI0, DMAC_DEI1, DMAC_DEI2, DMAC_DEI3),
64
-
INTC_GROUP(USB, USB_USI0, USB_USI1),
65
-
INTC_GROUP(SCIF0, SCIF0_ERI, SCIF0_RXI, SCIF0_TXI),
66
-
INTC_GROUP(SCIF2, SCIF2_ERI, SCIF2_RXI, SCIF2_TXI),
67
52
};
68
53
69
54
static struct intc_prio_reg prio_registers[] __initdata = {
···
63
78
64
79
};
65
80
66
-
static DECLARE_INTC_DESC(intc_desc, "sh7705", vectors, groups,
81
+
static DECLARE_INTC_DESC(intc_desc, "sh7705", vectors, NULL,
67
82
NULL, prio_registers, NULL);
68
83
69
84
static struct plat_sci_port sci_platform_data[] = {
···
71
86
.mapbase = 0xa4410000,
72
87
.flags = UPF_BOOT_AUTOCONF,
73
88
.type = PORT_SCIF,
74
-
.irqs = { 56, 57, 59 },
89
+
.irqs = { 56, 56, 56 },
75
90
}, {
76
91
.mapbase = 0xa4400000,
77
92
.flags = UPF_BOOT_AUTOCONF,
78
93
.type = PORT_SCIF,
79
-
.irqs = { 52, 53, 55 },
94
+
.irqs = { 52, 52, 52 },
80
95
}, {
81
96
.flags = 0,
82
97
}
···
99
114
[1] = {
100
115
.start = 20,
101
116
.flags = IORESOURCE_IRQ,
102
-
},
103
-
[2] = {
104
-
.start = 21,
105
-
.flags = IORESOURCE_IRQ,
106
-
},
107
-
[3] = {
108
-
.start = 22,
109
-
.flags = IORESOURCE_IRQ,
110
117
},
111
118
};
112
119