Re: [PATCH 2/2] spi_imx.c: TRIVIAL mx25 & mx35 SPI_VER is 0.7

From: Uwe Kleine-König
Date: Thu Dec 23 2010 - 09:29:51 EST


On Thu, Dec 23, 2010 at 12:12:10PM +0100, Richard Genoud wrote:
> The check on cpu_is_mx25 and cpu_is_mx35 was made twice.
> This is obviously wrong.
obviously wrong but no wrong behaviour. Your patch only makes the code
consistent, but IMHO it doesn't qualify as a bugfix.

> Anyway, this patch won't change the previous behaviour which is
> SPI_IMX_VER_0_7 for mx25 and mx35.
This conflicts with
http://mid.gmane.org/1290589546-21662-1-git-send-email-u.kleine-koenig@xxxxxxxxxxxxxx

which I prefer. The platform IDs have it correct (i.e.

imx25-cspi -> 0.7
imx31-cspi -> 0.4
imx35-cspi -> 0.7

)

Best regards
Uwe

>
> Signed-off-by: Richard Genoud <richard.genoud@xxxxxxxxx>
> ---
> drivers/spi/spi_imx.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
> index 793ae99..96be9d1 100644
> --- a/drivers/spi/spi_imx.c
> +++ b/drivers/spi/spi_imx.c
> @@ -806,7 +806,7 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
> if (cpu_is_mx25() || cpu_is_mx35())
> spi_imx->devtype_data =
> spi_imx_devtype_data[SPI_IMX_VER_0_7];
> - else if (cpu_is_mx25() || cpu_is_mx31() || cpu_is_mx35())
> + else if (cpu_is_mx31())
> spi_imx->devtype_data =
> spi_imx_devtype_data[SPI_IMX_VER_0_4];
> else if (cpu_is_mx27() || cpu_is_mx21())
> --
> 1.7.1
>
>

--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/