tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

sh: sh2: Change the specification method of IRQ to SCIx_IRQ_MUXED

Some SCIF devices specify the same IRQ. We can use SCIx_IRQ_MUXED for this.
This is correction to the SH2/SH2A series.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

authored by

Nobuhiro Iwamatsu and committed by
Paul Mundt e00e7cb3 545f3bcf

+20 -20
+3 -3
arch/sh/kernel/cpu/sh2/setup-sh7619.c
··· 65 65 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 66 66 .scbrr_algo_id = SCBRR_ALGO_2, 67 67 .type = PORT_SCIF, 68 - .irqs = { 88, 88, 88, 88 }, 68 + .irqs = SCIx_IRQ_MUXED(88), 69 69 }; 70 70 71 71 static struct platform_device scif0_device = { ··· 82 82 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 83 83 .scbrr_algo_id = SCBRR_ALGO_2, 84 84 .type = PORT_SCIF, 85 - .irqs = { 92, 92, 92, 92 }, 85 + .irqs = SCIx_IRQ_MUXED(92), 86 86 }; 87 87 88 88 static struct platform_device scif1_device = { ··· 99 99 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 100 100 .scbrr_algo_id = SCBRR_ALGO_2, 101 101 .type = PORT_SCIF, 102 - .irqs = { 96, 96, 96, 96 }, 102 + .irqs = SCIx_IRQ_MUXED(96), 103 103 }; 104 104 105 105 static struct platform_device scif2_device = {
+1 -1
arch/sh/kernel/cpu/sh2a/setup-mxg.c
··· 204 204 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 205 205 .scbrr_algo_id = SCBRR_ALGO_2, 206 206 .type = PORT_SCIF, 207 - .irqs = { 220, 220, 220, 220 }, 207 + .irqs = SCIx_IRQ_MUXED(220), 208 208 }; 209 209 210 210 static struct platform_device scif0_device = {
+8 -8
arch/sh/kernel/cpu/sh2a/setup-sh7201.c
··· 183 183 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 184 184 .scbrr_algo_id = SCBRR_ALGO_2, 185 185 .type = PORT_SCIF, 186 - .irqs = { 180, 180, 180, 180 } 186 + .irqs = SCIx_IRQ_MUXED(180), 187 187 }; 188 188 189 189 static struct platform_device scif0_device = { ··· 200 200 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 201 201 .scbrr_algo_id = SCBRR_ALGO_2, 202 202 .type = PORT_SCIF, 203 - .irqs = { 184, 184, 184, 184 } 203 + .irqs = SCIx_IRQ_MUXED(184), 204 204 }; 205 205 206 206 static struct platform_device scif1_device = { ··· 217 217 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 218 218 .scbrr_algo_id = SCBRR_ALGO_2, 219 219 .type = PORT_SCIF, 220 - .irqs = { 188, 188, 188, 188 } 220 + .irqs = SCIx_IRQ_MUXED(188), 221 221 }; 222 222 223 223 static struct platform_device scif2_device = { ··· 234 234 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 235 235 .scbrr_algo_id = SCBRR_ALGO_2, 236 236 .type = PORT_SCIF, 237 - .irqs = { 192, 192, 192, 192 } 237 + .irqs = SCIx_IRQ_MUXED(192), 238 238 }; 239 239 240 240 static struct platform_device scif3_device = { ··· 251 251 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 252 252 .scbrr_algo_id = SCBRR_ALGO_2, 253 253 .type = PORT_SCIF, 254 - .irqs = { 196, 196, 196, 196 } 254 + .irqs = SCIx_IRQ_MUXED(196), 255 255 }; 256 256 257 257 static struct platform_device scif4_device = { ··· 268 268 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 269 269 .scbrr_algo_id = SCBRR_ALGO_2, 270 270 .type = PORT_SCIF, 271 - .irqs = { 200, 200, 200, 200 } 271 + .irqs = SCIx_IRQ_MUXED(200), 272 272 }; 273 273 274 274 static struct platform_device scif5_device = { ··· 285 285 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 286 286 .scbrr_algo_id = SCBRR_ALGO_2, 287 287 .type = PORT_SCIF, 288 - .irqs = { 204, 204, 204, 204 } 288 + .irqs = SCIx_IRQ_MUXED(204), 289 289 }; 290 290 291 291 static struct platform_device scif6_device = { ··· 302 302 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 303 303 .scbrr_algo_id = SCBRR_ALGO_2, 304 304 .type = PORT_SCIF, 305 - .irqs = { 208, 208, 208, 208 } 305 + .irqs = SCIx_IRQ_MUXED(208), 306 306 }; 307 307 308 308 static struct platform_device scif7_device = {
+4 -4
arch/sh/kernel/cpu/sh2a/setup-sh7203.c
··· 180 180 SCSCR_REIE, 181 181 .scbrr_algo_id = SCBRR_ALGO_2, 182 182 .type = PORT_SCIF, 183 - .irqs = { 192, 192, 192, 192 }, 183 + .irqs = SCIx_IRQ_MUXED(192), 184 184 .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, 185 185 }; 186 186 ··· 199 199 SCSCR_REIE, 200 200 .scbrr_algo_id = SCBRR_ALGO_2, 201 201 .type = PORT_SCIF, 202 - .irqs = { 196, 196, 196, 196 }, 202 + .irqs = SCIx_IRQ_MUXED(196), 203 203 .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, 204 204 }; 205 205 ··· 218 218 SCSCR_REIE, 219 219 .scbrr_algo_id = SCBRR_ALGO_2, 220 220 .type = PORT_SCIF, 221 - .irqs = { 200, 200, 200, 200 }, 221 + .irqs = SCIx_IRQ_MUXED(200), 222 222 .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, 223 223 }; 224 224 ··· 237 237 SCSCR_REIE, 238 238 .scbrr_algo_id = SCBRR_ALGO_2, 239 239 .type = PORT_SCIF, 240 - .irqs = { 204, 204, 204, 204 }, 240 + .irqs = SCIx_IRQ_MUXED(204), 241 241 .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, 242 242 }; 243 243
+4 -4
arch/sh/kernel/cpu/sh2a/setup-sh7206.c
··· 139 139 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 140 140 .scbrr_algo_id = SCBRR_ALGO_2, 141 141 .type = PORT_SCIF, 142 - .irqs = { 240, 240, 240, 240 }, 142 + .irqs = SCIx_IRQ_MUXED(240), 143 143 }; 144 144 145 145 static struct platform_device scif0_device = { ··· 156 156 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 157 157 .scbrr_algo_id = SCBRR_ALGO_2, 158 158 .type = PORT_SCIF, 159 - .irqs = { 244, 244, 244, 244 }, 159 + .irqs = SCIx_IRQ_MUXED(244), 160 160 }; 161 161 162 162 static struct platform_device scif1_device = { ··· 173 173 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 174 174 .scbrr_algo_id = SCBRR_ALGO_2, 175 175 .type = PORT_SCIF, 176 - .irqs = { 248, 248, 248, 248 }, 176 + .irqs = SCIx_IRQ_MUXED(248), 177 177 }; 178 178 179 179 static struct platform_device scif2_device = { ··· 190 190 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, 191 191 .scbrr_algo_id = SCBRR_ALGO_2, 192 192 .type = PORT_SCIF, 193 - .irqs = { 252, 252, 252, 252 }, 193 + .irqs = SCIx_IRQ_MUXED(252), 194 194 }; 195 195 196 196 static struct platform_device scif3_device = {