diff options
| author | Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> | 2012-04-12 23:14:00 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-04-17 03:17:30 -0400 |
| commit | eb0cdbe6b8cde26318666f86f8f5fb08d2336ce5 (patch) | |
| tree | 5ca5954517857638f9e43b8d599e5e9af0e85660 /arch/sh/kernel/cpu/sh4a/setup-sh7757.c | |
| parent | 33cd5cffd50a789f4e2f0f8bcd7ed9cf8a07da16 (diff) | |
sh: sh4a: 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 SH4A 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/sh4a/setup-sh7757.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c index c8836cffa216..fe45e4cb183d 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c | |||
| @@ -28,7 +28,7 @@ static struct plat_sci_port scif2_platform_data = { | |||
| 28 | .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, | 28 | .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, |
| 29 | .scbrr_algo_id = SCBRR_ALGO_2, | 29 | .scbrr_algo_id = SCBRR_ALGO_2, |
| 30 | .type = PORT_SCIF, | 30 | .type = PORT_SCIF, |
| 31 | .irqs = { 40, 40, 40, 40 }, | 31 | .irqs = SCIx_IRQ_MUXED(evt2irq(0x700)), |
| 32 | }; | 32 | }; |
| 33 | 33 | ||
| 34 | static struct platform_device scif2_device = { | 34 | static struct platform_device scif2_device = { |
| @@ -45,7 +45,7 @@ static struct plat_sci_port scif3_platform_data = { | |||
| 45 | .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, | 45 | .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, |
| 46 | .scbrr_algo_id = SCBRR_ALGO_2, | 46 | .scbrr_algo_id = SCBRR_ALGO_2, |
| 47 | .type = PORT_SCIF, | 47 | .type = PORT_SCIF, |
| 48 | .irqs = { 76, 76, 76, 76 }, | 48 | .irqs = SCIx_IRQ_MUXED(evt2irq(0xB80)), |
| 49 | }; | 49 | }; |
| 50 | 50 | ||
| 51 | static struct platform_device scif3_device = { | 51 | static struct platform_device scif3_device = { |
| @@ -62,7 +62,7 @@ static struct plat_sci_port scif4_platform_data = { | |||
| 62 | .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, | 62 | .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, |
| 63 | .scbrr_algo_id = SCBRR_ALGO_2, | 63 | .scbrr_algo_id = SCBRR_ALGO_2, |
| 64 | .type = PORT_SCIF, | 64 | .type = PORT_SCIF, |
| 65 | .irqs = { 104, 104, 104, 104 }, | 65 | .irqs = SCIx_IRQ_MUXED(evt2irq(0xF00)), |
| 66 | }; | 66 | }; |
| 67 | 67 | ||
| 68 | static struct platform_device scif4_device = { | 68 | static struct platform_device scif4_device = { |