Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5417421b authored by Andriy Skulysh's avatar Andriy Skulysh Committed by Linus Torvalds
Browse files

sh: fix sh770x SCIF memory regions 



Resources scif1_resources & scif2_resources overlap.  Actual SCIF region
size is 0x10.

This is regression from commit d850acf9 ("sh: Declare SCIF register
base and IRQ as resources")

Signed-off-by: default avatarAndriy Skulysh <askulysh@gmail.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5a99e95b

arch/sh/kernel/cpu/sh3/setup-sh770x.c

+3 −3
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static struct plat_sci_port scif0_platform_data = { 
};



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_platform_data = { 
};



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_platform_data = { 
};



static struct resource scif2_resources[] = {

	DEFINE_RES_MEM(0xa4000140, 0x100),

	DEFINE_RES_MEM(0xa4000140, 0x10),

	DEFINE_RES_IRQ(evt2irq(0x880)),

};