diff options
| author | Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> | 2012-04-12 23:14:01 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-04-17 03:17:31 -0400 |
| commit | 51edfb3375d276ba81ba26220c699a524be71f59 (patch) | |
| tree | 6cd0f11e862cacde1582a6b4d67e891221fdcb30 /arch/sh/kernel/cpu/sh4 | |
| parent | eb0cdbe6b8cde26318666f86f8f5fb08d2336ce5 (diff) | |
sh: sh4: 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.
And change use to evt2irq(), without specifying the value of IRQ directly.
This is correction to the SH4 series.
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh4')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh7750.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c index 98cc0c794c76..56b3bdc0b285 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c | |||
| @@ -43,7 +43,7 @@ static struct plat_sci_port sci_platform_data = { | |||
| 43 | .scscr = SCSCR_TE | SCSCR_RE, | 43 | .scscr = SCSCR_TE | SCSCR_RE, |
| 44 | .scbrr_algo_id = SCBRR_ALGO_2, | 44 | .scbrr_algo_id = SCBRR_ALGO_2, |
| 45 | .type = PORT_SCI, | 45 | .type = PORT_SCI, |
| 46 | .irqs = { 23, 23, 23, 0 }, | 46 | .irqs = SCIx_IRQ_MUXED(evt2irq(0xE40)), |
| 47 | .regshift = 2, | 47 | .regshift = 2, |
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| @@ -61,7 +61,7 @@ static struct plat_sci_port scif_platform_data = { | |||
| 61 | .scscr = SCSCR_TE | SCSCR_RE | SCSCR_REIE, | 61 | .scscr = SCSCR_TE | SCSCR_RE | SCSCR_REIE, |
| 62 | .scbrr_algo_id = SCBRR_ALGO_2, | 62 | .scbrr_algo_id = SCBRR_ALGO_2, |
| 63 | .type = PORT_SCIF, | 63 | .type = PORT_SCIF, |
| 64 | .irqs = { 40, 40, 40, 40 }, | 64 | .irqs = SCIx_IRQ_MUXED(evt2irq(0x700)), |
| 65 | }; | 65 | }; |
| 66 | 66 | ||
| 67 | static struct platform_device scif_device = { | 67 | static struct platform_device scif_device = { |
