diff options
author | Magnus Damm <damm@igel.co.jp> | 2007-08-16 11:45:35 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-09-20 22:57:50 -0400 |
commit | 5c37e025352b993d8726b0207ff2270b2f2bc7d6 (patch) | |
tree | 87463d1c79600c37d3df06cbdbdf14bdc6de5094 /arch/sh/kernel/cpu/sh3 | |
parent | 46420e49c9fd76defecfb3f048ab20c5a72dfd0a (diff) |
sh: intc - mark data structures as __initdata
With the intc core improved it is now possible to put the intc data
structures in the initdata section.
Version two of this patch puts the __initdata inside DECLARE_INTC_DESC()
and removes the __initdata included in the board specific r2d code.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh3')
-rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh7705.c | 10 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh770x.c | 10 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh7710.c | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c index a1b342e170c6..f6c65f2659e9 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c | |||
@@ -36,7 +36,7 @@ enum { | |||
36 | RTC, TMU2, DMAC, USB, SCIF2, SCIF0, | 36 | RTC, TMU2, DMAC, USB, SCIF2, SCIF0, |
37 | }; | 37 | }; |
38 | 38 | ||
39 | static struct intc_vect vectors[] = { | 39 | static struct intc_vect vectors[] __initdata = { |
40 | INTC_VECT(IRQ4, 0x680), INTC_VECT(IRQ5, 0x6a0), | 40 | INTC_VECT(IRQ4, 0x680), INTC_VECT(IRQ5, 0x6a0), |
41 | INTC_VECT(PINT07, 0x700), INTC_VECT(PINT815, 0x720), | 41 | INTC_VECT(PINT07, 0x700), INTC_VECT(PINT815, 0x720), |
42 | INTC_VECT(DMAC_DEI0, 0x800), INTC_VECT(DMAC_DEI1, 0x820), | 42 | INTC_VECT(DMAC_DEI0, 0x800), INTC_VECT(DMAC_DEI1, 0x820), |
@@ -57,7 +57,7 @@ static struct intc_vect vectors[] = { | |||
57 | INTC_VECT(REF_RCMI, 0x580), | 57 | INTC_VECT(REF_RCMI, 0x580), |
58 | }; | 58 | }; |
59 | 59 | ||
60 | static struct intc_group groups[] = { | 60 | static struct intc_group groups[] __initdata = { |
61 | INTC_GROUP(RTC, RTC_ATI, RTC_PRI, RTC_CUI), | 61 | INTC_GROUP(RTC, RTC_ATI, RTC_PRI, RTC_CUI), |
62 | INTC_GROUP(TMU2, TMU2_TUNI, TMU2_TICPI), | 62 | INTC_GROUP(TMU2, TMU2_TUNI, TMU2_TICPI), |
63 | INTC_GROUP(DMAC, DMAC_DEI0, DMAC_DEI1, DMAC_DEI2, DMAC_DEI3), | 63 | INTC_GROUP(DMAC, DMAC_DEI0, DMAC_DEI1, DMAC_DEI2, DMAC_DEI3), |
@@ -66,13 +66,13 @@ static struct intc_group groups[] = { | |||
66 | INTC_GROUP(SCIF2, SCIF2_ERI, SCIF2_RXI, SCIF2_TXI), | 66 | INTC_GROUP(SCIF2, SCIF2_ERI, SCIF2_RXI, SCIF2_TXI), |
67 | }; | 67 | }; |
68 | 68 | ||
69 | static struct intc_prio priorities[] = { | 69 | static struct intc_prio priorities[] __initdata = { |
70 | INTC_PRIO(DMAC, 7), | 70 | INTC_PRIO(DMAC, 7), |
71 | INTC_PRIO(SCIF2, 3), | 71 | INTC_PRIO(SCIF2, 3), |
72 | INTC_PRIO(SCIF0, 3), | 72 | INTC_PRIO(SCIF0, 3), |
73 | }; | 73 | }; |
74 | 74 | ||
75 | static struct intc_prio_reg prio_registers[] = { | 75 | static struct intc_prio_reg prio_registers[] __initdata = { |
76 | { 0xfffffee2, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } }, | 76 | { 0xfffffee2, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } }, |
77 | { 0xfffffee4, 0, 16, 4, /* IPRB */ { WDT, REF_RCMI, 0, 0 } }, | 77 | { 0xfffffee4, 0, 16, 4, /* IPRB */ { WDT, REF_RCMI, 0, 0 } }, |
78 | { 0xa4000016, 0, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } }, | 78 | { 0xa4000016, 0, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } }, |
@@ -87,7 +87,7 @@ static struct intc_prio_reg prio_registers[] = { | |||
87 | static DECLARE_INTC_DESC(intc_desc, "sh7705", vectors, groups, | 87 | static DECLARE_INTC_DESC(intc_desc, "sh7705", vectors, groups, |
88 | priorities, NULL, prio_registers, NULL); | 88 | priorities, NULL, prio_registers, NULL); |
89 | 89 | ||
90 | static struct intc_vect vectors_irq[] = { | 90 | static struct intc_vect vectors_irq[] __initdata = { |
91 | INTC_VECT(IRQ0, 0x600), INTC_VECT(IRQ1, 0x620), | 91 | INTC_VECT(IRQ0, 0x600), INTC_VECT(IRQ1, 0x620), |
92 | INTC_VECT(IRQ2, 0x640), INTC_VECT(IRQ3, 0x660), | 92 | INTC_VECT(IRQ2, 0x640), INTC_VECT(IRQ3, 0x660), |
93 | }; | 93 | }; |
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh770x.c b/arch/sh/kernel/cpu/sh3/setup-sh770x.c index 2980c44ffb2f..60b04b1f9453 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh770x.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh770x.c | |||
@@ -39,7 +39,7 @@ enum { | |||
39 | RTC, REF, TMU2, DMAC, SCI, SCIF2, SCIF0, | 39 | RTC, REF, TMU2, DMAC, SCI, SCIF2, SCIF0, |
40 | }; | 40 | }; |
41 | 41 | ||
42 | static struct intc_vect vectors[] = { | 42 | static struct intc_vect vectors[] __initdata = { |
43 | INTC_VECT(TMU0, 0x400), INTC_VECT(TMU1, 0x420), | 43 | INTC_VECT(TMU0, 0x400), INTC_VECT(TMU1, 0x420), |
44 | INTC_VECT(TMU2_TUNI, 0x440), INTC_VECT(TMU2_TICPI, 0x460), | 44 | INTC_VECT(TMU2_TUNI, 0x440), INTC_VECT(TMU2_TICPI, 0x460), |
45 | INTC_VECT(RTC_ATI, 0x480), INTC_VECT(RTC_PRI, 0x4a0), | 45 | INTC_VECT(RTC_ATI, 0x480), INTC_VECT(RTC_PRI, 0x4a0), |
@@ -71,7 +71,7 @@ static struct intc_vect vectors[] = { | |||
71 | #endif | 71 | #endif |
72 | }; | 72 | }; |
73 | 73 | ||
74 | static struct intc_group groups[] = { | 74 | static struct intc_group groups[] __initdata = { |
75 | INTC_GROUP(RTC, RTC_ATI, RTC_PRI, RTC_CUI), | 75 | INTC_GROUP(RTC, RTC_ATI, RTC_PRI, RTC_CUI), |
76 | INTC_GROUP(TMU2, TMU2_TUNI, TMU2_TICPI), | 76 | INTC_GROUP(TMU2, TMU2_TUNI, TMU2_TICPI), |
77 | INTC_GROUP(REF, REF_RCMI, REF_ROVI), | 77 | INTC_GROUP(REF, REF_RCMI, REF_ROVI), |
@@ -81,14 +81,14 @@ static struct intc_group groups[] = { | |||
81 | INTC_GROUP(SCIF2, SCIF2_ERI, SCIF2_RXI, SCIF2_BRI, SCIF2_TXI), | 81 | INTC_GROUP(SCIF2, SCIF2_ERI, SCIF2_RXI, SCIF2_BRI, SCIF2_TXI), |
82 | }; | 82 | }; |
83 | 83 | ||
84 | static struct intc_prio priorities[] = { | 84 | static struct intc_prio priorities[] __initdata = { |
85 | INTC_PRIO(DMAC, 7), | 85 | INTC_PRIO(DMAC, 7), |
86 | INTC_PRIO(SCI, 3), | 86 | INTC_PRIO(SCI, 3), |
87 | INTC_PRIO(SCIF2, 3), | 87 | INTC_PRIO(SCIF2, 3), |
88 | INTC_PRIO(SCIF0, 3), | 88 | INTC_PRIO(SCIF0, 3), |
89 | }; | 89 | }; |
90 | 90 | ||
91 | static struct intc_prio_reg prio_registers[] = { | 91 | static struct intc_prio_reg prio_registers[] __initdata = { |
92 | { 0xfffffee2, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } }, | 92 | { 0xfffffee2, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } }, |
93 | { 0xfffffee4, 0, 16, 4, /* IPRB */ { WDT, REF, SCI, 0 } }, | 93 | { 0xfffffee4, 0, 16, 4, /* IPRB */ { WDT, REF, SCI, 0 } }, |
94 | #if defined(CONFIG_CPU_SUBTYPE_SH7706) || \ | 94 | #if defined(CONFIG_CPU_SUBTYPE_SH7706) || \ |
@@ -114,7 +114,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh770x", vectors, groups, | |||
114 | #if defined(CONFIG_CPU_SUBTYPE_SH7706) || \ | 114 | #if defined(CONFIG_CPU_SUBTYPE_SH7706) || \ |
115 | defined(CONFIG_CPU_SUBTYPE_SH7707) || \ | 115 | defined(CONFIG_CPU_SUBTYPE_SH7707) || \ |
116 | defined(CONFIG_CPU_SUBTYPE_SH7709) | 116 | defined(CONFIG_CPU_SUBTYPE_SH7709) |
117 | static struct intc_vect vectors_irq[] = { | 117 | static struct intc_vect vectors_irq[] __initdata = { |
118 | INTC_VECT(IRQ0, 0x600), INTC_VECT(IRQ1, 0x620), | 118 | INTC_VECT(IRQ0, 0x600), INTC_VECT(IRQ1, 0x620), |
119 | INTC_VECT(IRQ2, 0x640), INTC_VECT(IRQ3, 0x660), | 119 | INTC_VECT(IRQ2, 0x640), INTC_VECT(IRQ3, 0x660), |
120 | }; | 120 | }; |
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c index 5aa77710e42b..84e5629fa841 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c | |||
@@ -37,7 +37,7 @@ enum { | |||
37 | RTC, DMAC1, SCIF0, SCIF1, DMAC2, SIOF0, SIOF1, | 37 | RTC, DMAC1, SCIF0, SCIF1, DMAC2, SIOF0, SIOF1, |
38 | }; | 38 | }; |
39 | 39 | ||
40 | static struct intc_vect vectors[] = { | 40 | static struct intc_vect vectors[] __initdata = { |
41 | INTC_VECT(IRQ4, 0x680), INTC_VECT(IRQ5, 0x6a0), | 41 | INTC_VECT(IRQ4, 0x680), INTC_VECT(IRQ5, 0x6a0), |
42 | INTC_VECT(DMAC_DEI0, 0x800), INTC_VECT(DMAC_DEI1, 0x820), | 42 | INTC_VECT(DMAC_DEI0, 0x800), INTC_VECT(DMAC_DEI1, 0x820), |
43 | INTC_VECT(DMAC_DEI2, 0x840), INTC_VECT(DMAC_DEI3, 0x860), | 43 | INTC_VECT(DMAC_DEI2, 0x840), INTC_VECT(DMAC_DEI3, 0x860), |
@@ -63,7 +63,7 @@ static struct intc_vect vectors[] = { | |||
63 | INTC_VECT(REF, 0x580), | 63 | INTC_VECT(REF, 0x580), |
64 | }; | 64 | }; |
65 | 65 | ||
66 | static struct intc_group groups[] = { | 66 | static struct intc_group groups[] __initdata = { |
67 | INTC_GROUP(RTC, RTC_ATI, RTC_PRI, RTC_CUI), | 67 | INTC_GROUP(RTC, RTC_ATI, RTC_PRI, RTC_CUI), |
68 | INTC_GROUP(DMAC1, DMAC_DEI0, DMAC_DEI1, DMAC_DEI2, DMAC_DEI3), | 68 | INTC_GROUP(DMAC1, DMAC_DEI0, DMAC_DEI1, DMAC_DEI2, DMAC_DEI3), |
69 | INTC_GROUP(SCIF0, SCIF0_ERI, SCIF0_RXI, SCIF0_BRI, SCIF0_TXI), | 69 | INTC_GROUP(SCIF0, SCIF0_ERI, SCIF0_RXI, SCIF0_BRI, SCIF0_TXI), |
@@ -73,7 +73,7 @@ static struct intc_group groups[] = { | |||
73 | INTC_GROUP(SIOF1, SIOF1_ERI, SIOF1_TXI, SIOF1_RXI, SIOF1_CCI), | 73 | INTC_GROUP(SIOF1, SIOF1_ERI, SIOF1_TXI, SIOF1_RXI, SIOF1_CCI), |
74 | }; | 74 | }; |
75 | 75 | ||
76 | static struct intc_prio priorities[] = { | 76 | static struct intc_prio priorities[] __initdata = { |
77 | INTC_PRIO(DMAC1, 7), | 77 | INTC_PRIO(DMAC1, 7), |
78 | INTC_PRIO(DMAC2, 7), | 78 | INTC_PRIO(DMAC2, 7), |
79 | INTC_PRIO(SCIF0, 3), | 79 | INTC_PRIO(SCIF0, 3), |
@@ -85,7 +85,7 @@ static struct intc_prio priorities[] = { | |||
85 | INTC_PRIO(EDMAC2, 5), | 85 | INTC_PRIO(EDMAC2, 5), |
86 | }; | 86 | }; |
87 | 87 | ||
88 | static struct intc_prio_reg prio_registers[] = { | 88 | static struct intc_prio_reg prio_registers[] __initdata = { |
89 | { 0xfffffee2, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } }, | 89 | { 0xfffffee2, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } }, |
90 | { 0xfffffee4, 0, 16, 4, /* IPRB */ { WDT, REF, 0, 0 } }, | 90 | { 0xfffffee4, 0, 16, 4, /* IPRB */ { WDT, REF, 0, 0 } }, |
91 | { 0xa4000016, 0, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } }, | 91 | { 0xa4000016, 0, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } }, |
@@ -103,7 +103,7 @@ static struct intc_prio_reg prio_registers[] = { | |||
103 | static DECLARE_INTC_DESC(intc_desc, "sh7710", vectors, groups, | 103 | static DECLARE_INTC_DESC(intc_desc, "sh7710", vectors, groups, |
104 | priorities, NULL, prio_registers, NULL); | 104 | priorities, NULL, prio_registers, NULL); |
105 | 105 | ||
106 | static struct intc_vect vectors_irq[] = { | 106 | static struct intc_vect vectors_irq[] __initdata = { |
107 | INTC_VECT(IRQ0, 0x600), INTC_VECT(IRQ1, 0x620), | 107 | INTC_VECT(IRQ0, 0x600), INTC_VECT(IRQ1, 0x620), |
108 | INTC_VECT(IRQ2, 0x640), INTC_VECT(IRQ3, 0x660), | 108 | INTC_VECT(IRQ2, 0x640), INTC_VECT(IRQ3, 0x660), |
109 | }; | 109 | }; |