lkml.org 
[lkml]   [2014]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 155/170] sh: fix sh770x SCIF memory regions
    Date
    3.16.7-ckt1 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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: Luis Henriques <luis.henriques@canonical.com>
    ---
    arch/sh/kernel/cpu/sh3/setup-sh770x.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/sh/kernel/cpu/sh3/setup-sh770x.c b/arch/sh/kernel/cpu/sh3/setup-sh770x.c
    index 9139d14b9c53..538c10db3537 100644
    --- 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_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)),
    };

    --
    2.1.0


    \
     
     \ /
      Last update: 2014-11-11 12:41    [W:4.046 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site