| From 5417421b270229bfce0795ccc99a4b481e4954ca Mon Sep 17 00:00:00 2001 |
| From: Andriy Skulysh <askulysh@gmail.com> |
| Date: Wed, 29 Oct 2014 14:50:59 -0700 |
| Subject: sh: fix sh770x SCIF memory regions |
| |
| From: Andriy Skulysh <askulysh@gmail.com> |
| |
| commit 5417421b270229bfce0795ccc99a4b481e4954ca upstream. |
| |
| Resources scif1_resources & scif2_resources overlap. Actual SCIF region |
| size is 0x10. |
| |
| This is regression from commit d850acf975be ("sh: Declare SCIF register |
| base and IRQ as resources") |
| |
| Signed-off-by: Andriy Skulysh <askulysh@gmail.com> |
| Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Cc: Geert Uytterhoeven <geert@linux-m68k.org> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/sh/kernel/cpu/sh3/setup-sh770x.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/arch/sh/kernel/cpu/sh3/setup-sh770x.c |
| +++ b/arch/sh/kernel/cpu/sh3/setup-sh770x.c |
| @@ -118,7 +118,7 @@ static struct plat_sci_port scif0_platfo |
| }; |
| |
| static struct resource scif0_resources[] = { |
| - DEFINE_RES_MEM(0xfffffe80, 0x100), |
| + DEFINE_RES_MEM(0xfffffe80, 0x10), |
| DEFINE_RES_IRQ(evt2irq(0x4e0)), |
| }; |
| |
| @@ -143,7 +143,7 @@ static struct plat_sci_port scif1_platfo |
| }; |
| |
| static struct resource scif1_resources[] = { |
| - DEFINE_RES_MEM(0xa4000150, 0x100), |
| + DEFINE_RES_MEM(0xa4000150, 0x10), |
| DEFINE_RES_IRQ(evt2irq(0x900)), |
| }; |
| |
| @@ -169,7 +169,7 @@ static struct plat_sci_port scif2_platfo |
| }; |
| |
| static struct resource scif2_resources[] = { |
| - DEFINE_RES_MEM(0xa4000140, 0x100), |
| + DEFINE_RES_MEM(0xa4000140, 0x10), |
| DEFINE_RES_IRQ(evt2irq(0x880)), |
| }; |
| |
