lkml.org 
[lkml]   [2009]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/5] spi-imx: Add mx25 support
    Date
    From: Sascha Hauer <s.hauer@pengutronix.de>

    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    ---
    drivers/spi/spi_imx.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
    index 0ccbd1c..59b3a30 100644
    --- a/drivers/spi/spi_imx.c
    +++ b/drivers/spi/spi_imx.c
    @@ -208,7 +208,7 @@ static int mx31_config(struct spi_imx_data *spi_imx,

    if (cpu_is_mx31())
    reg |= (config->bpw - 1) << MX31_CSPICTRL_BC_SHIFT;
    - else if (cpu_is_mx35()) {
    + else if (cpu_is_mx25() || cpu_is_mx35()) {
    reg |= (config->bpw - 1) << MX35_CSPICTRL_BL_SHIFT;
    reg |= MX31_CSPICTRL_SSCTL;
    }
    @@ -222,7 +222,7 @@ static int mx31_config(struct spi_imx_data *spi_imx,
    if (config->cs < 0) {
    if (cpu_is_mx31())
    reg |= (config->cs + 32) << MX31_CSPICTRL_CS_SHIFT;
    - else if (cpu_is_mx35())
    + else if (cpu_is_mx25() || cpu_is_mx35())
    reg |= (config->cs + 32) << MX35_CSPICTRL_CS_SHIFT;
    }

    @@ -565,7 +565,7 @@ static int __init spi_imx_probe(struct platform_device *pdev)
    goto out_iounmap;
    }

    - if (cpu_is_mx31() || cpu_is_mx35()) {
    + if (cpu_is_mx25() || cpu_is_mx31() || cpu_is_mx35()) {
    spi_imx->intctrl = mx31_intctrl;
    spi_imx->config = mx31_config;
    spi_imx->trigger = mx31_trigger;
    @@ -597,7 +597,7 @@ static int __init spi_imx_probe(struct platform_device *pdev)
    writel(1, spi_imx->base + MXC_RESET);

    /* drain receive buffer */
    - if (cpu_is_mx31() || cpu_is_mx35())
    + if (cpu_is_mx25() || cpu_is_mx31() || cpu_is_mx35())
    while (readl(spi_imx->base + MX3_CSPISTAT) & MX3_CSPISTAT_RR)
    readl(spi_imx->base + MXC_CSPIRXDATA);

    --
    1.6.5.2
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2009-12-08 22:19    [W:0.023 / U:0.920 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site