diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/c6x/kernel/irq.c | 1 | ||||
-rw-r--r-- | arch/c6x/platforms/megamod-pic.c | 14 |
2 files changed, 2 insertions, 13 deletions
diff --git a/arch/c6x/kernel/irq.c b/arch/c6x/kernel/irq.c index c6b36e86a010..d77bcfdf0d8e 100644 --- a/arch/c6x/kernel/irq.c +++ b/arch/c6x/kernel/irq.c | |||
@@ -88,6 +88,7 @@ static int core_domain_map(struct irq_domain *h, unsigned int virq, | |||
88 | 88 | ||
89 | static const struct irq_domain_ops core_domain_ops = { | 89 | static const struct irq_domain_ops core_domain_ops = { |
90 | .map = core_domain_map, | 90 | .map = core_domain_map, |
91 | .xlate = irq_domain_xlate_onecell, | ||
91 | }; | 92 | }; |
92 | 93 | ||
93 | void __init init_IRQ(void) | 94 | void __init init_IRQ(void) |
diff --git a/arch/c6x/platforms/megamod-pic.c b/arch/c6x/platforms/megamod-pic.c index 9f35fbf2df3e..c1c4e2ae3f85 100644 --- a/arch/c6x/platforms/megamod-pic.c +++ b/arch/c6x/platforms/megamod-pic.c | |||
@@ -136,21 +136,9 @@ static int megamod_map(struct irq_domain *h, unsigned int virq, | |||
136 | return 0; | 136 | return 0; |
137 | } | 137 | } |
138 | 138 | ||
139 | static int megamod_xlate(struct irq_domain *h, struct device_node *ct, | ||
140 | const u32 *intspec, unsigned int intsize, | ||
141 | irq_hw_number_t *out_hwirq, unsigned int *out_type) | ||
142 | |||
143 | { | ||
144 | /* megamod intspecs must have 1 cell */ | ||
145 | BUG_ON(intsize != 1); | ||
146 | *out_hwirq = intspec[0]; | ||
147 | *out_type = IRQ_TYPE_NONE; | ||
148 | return 0; | ||
149 | } | ||
150 | |||
151 | static const struct irq_domain_ops megamod_domain_ops = { | 139 | static const struct irq_domain_ops megamod_domain_ops = { |
152 | .map = megamod_map, | 140 | .map = megamod_map, |
153 | .xlate = megamod_xlate, | 141 | .xlate = irq_domain_xlate_onecell, |
154 | }; | 142 | }; |
155 | 143 | ||
156 | static void __init set_megamod_mux(struct megamod_pic *pic, int src, int output) | 144 | static void __init set_megamod_mux(struct megamod_pic *pic, int src, int output) |