From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Mundt Date: Fri, 18 May 2012 09:11:17 +0000 Subject: Re: [PATCH 2/4] sh: sh4: Change the specification method of IRQ to SCIx_IRQ_MUXED Message-Id: <20120518091117.GF24355@linux-sh.org> List-Id: References: <1334286843-3297-2-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> In-Reply-To: <1334286843-3297-2-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-sh@vger.kernel.org On Fri, Apr 13, 2012 at 12:14:01PM +0900, Nobuhiro Iwamatsu wrote: > 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 > --- > 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 98cc0c7..56b3bdc 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 = { > .scscr = SCSCR_TE | SCSCR_RE, > .scbrr_algo_id = SCBRR_ALGO_2, > .type = PORT_SCI, > - .irqs = { 23, 23, 23, 0 }, > + .irqs = SCIx_IRQ_MUXED(evt2irq(0xE40)), > .regshift = 2, > }; > 23 is actually 0x4e0, 0xe40 would be 98. Fortunately git merge collided on this while I was merging my evt2irq migration branch, as it's unlikely anyone would have noticed this for some time..