diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 02:24:37 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 02:24:37 +0300 |
| commit | 8473dbb43db92fa8de7c24d1973aaf1e0276a89f (patch) | |
| tree | 3fca0a8ab3cea5c41098e0f04fae690cce38f70e /drivers/spi/spi_imx.c | |
| parent | 7cb3920a6529df7f54487abe973b903b8239e901 (diff) | |
| parent | 94a1b6d8eb903818773ad24fe48529b0d295052d (diff) | |
| download | linux-8473dbb43db92fa8de7c24d1973aaf1e0276a89f.tar.xz | |
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
spi/amba-pl022: fixing compilation warning.
spi: Enable SPI driver for S5P6440 and S5P6450
mmc: sdhci-of: fix build on non-powerpc platforms
spi/imx: Add i.MX53 support
spi/dw_spi: don't treat NULL clk as an error
spi: tegra: don't treat NULL clk as an error
Diffstat (limited to 'drivers/spi/spi_imx.c')
| -rw-r--r-- | drivers/spi/spi_imx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 9469564e6888..1cf9d5faabf4 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c @@ -743,6 +743,12 @@ static struct platform_device_id spi_imx_devtype[] = { .name = "imx51-ecspi", .driver_data = SPI_IMX_VER_2_3, }, { + .name = "imx53-cspi", + .driver_data = SPI_IMX_VER_0_7, + }, { + .name = "imx53-ecspi", + .driver_data = SPI_IMX_VER_2_3, + }, { /* sentinel */ } }; |