lkml.org 
[lkml]   [2012]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 131/262] ARM: imx: armadillo5x0: Fix illegal register access
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.5-stable review patch. If anyone has any objections, please let me know.

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

    From: Fabio Estevam <fabio.estevam@freescale.com>

    commit 35495173e1df621dff0e9a244accbe32cd28a98f upstream.

    Since commit eb92044eb (ARM i.MX3: Make ccm base address a variable )
    it is necessary to pass the CCM register base as a variable.

    Fix the CCM register access in mach-armadillo5x0 by passing mx3_ccm_base and
    avoid illegal accesses.

    Also applies to v3.5

    Reported-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
    Acked-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/mach-imx/mach-armadillo5x0.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/arch/arm/mach-imx/mach-armadillo5x0.c
    +++ b/arch/arm/mach-imx/mach-armadillo5x0.c
    @@ -526,7 +526,8 @@ static void __init armadillo5x0_init(voi
    imx31_add_mxc_nand(&armadillo5x0_nand_board_info);

    /* set NAND page size to 2k if not configured via boot mode pins */
    - __raw_writel(__raw_readl(MXC_CCM_RCSR) | (1 << 30), MXC_CCM_RCSR);
    + __raw_writel(__raw_readl(mx3_ccm_base + MXC_CCM_RCSR) |
    + (1 << 30), mx3_ccm_base + MXC_CCM_RCSR);

    /* RTC */
    /* Get RTC IRQ and register the chip */



    \
     
     \ /
      Last update: 2012-09-28 22:41    [W:2.328 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site