diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-05 12:59:29 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-05 12:59:29 +0200 |
| commit | 9196d727ad54288977ded7a8ce4ad3dc83eb385a (patch) | |
| tree | b29ed67eee25181ce07138de57ec6dea64217957 /drivers | |
| parent | 038307cb5e6e0e655ec251f561959afd2ef1bfd1 (diff) | |
| parent | 74bde540e23dd91ce75cdec7886d183a509ec3bd (diff) | |
| download | barebox-9196d727ad54288977ded7a8ce4ad3dc83eb385a.tar.gz barebox-9196d727ad54288977ded7a8ce4ad3dc83eb385a.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/spi/imx_spi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index a249b81f51..b5c55a4afc 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -16,7 +16,7 @@ config DRIVER_SPI_IMX_0_0 config DRIVER_SPI_IMX_0_7 bool - depends on ARCH_IMX25 + depends on ARCH_IMX25 || ARCH_IMX35 default y config DRIVER_SPI_IMX_2_3 diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c index 2e59b3c8dd..80a14504f0 100644 --- a/drivers/spi/imx_spi.c +++ b/drivers/spi/imx_spi.c @@ -517,7 +517,7 @@ static int imx_spi_probe(struct device_d *dev) version = SPI_IMX_VER_0_0; #endif #ifdef CONFIG_DRIVER_SPI_IMX_0_7 - if (cpu_is_mx25()) + if (cpu_is_mx25() || cpu_is_mx35()) version = SPI_IMX_VER_0_7; #endif #ifdef CONFIG_DRIVER_SPI_IMX_2_3 |