diff options
| -rw-r--r-- | arch/arm/mach-imx/include/mach/devices-imx31.h | 6 | ||||
| -rw-r--r-- | drivers/spi/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/spi/imx_spi.c | 15 | ||||
| -rw-r--r-- | include/spi/imx-spi.h | 7 |
4 files changed, 23 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/include/mach/devices-imx31.h b/arch/arm/mach-imx/include/mach/devices-imx31.h index 63319fea37..7c70e40f9d 100644 --- a/arch/arm/mach-imx/include/mach/devices-imx31.h +++ b/arch/arm/mach-imx/include/mach/devices-imx31.h @@ -4,17 +4,17 @@ static inline struct device_d *imx31_add_spi0(struct spi_imx_master *pdata) { - return imx_add_spi_imx27((void *)MX31_CSPI1_BASE_ADDR, 0, pdata); + return imx_add_spi_imx35((void *)MX31_CSPI1_BASE_ADDR, 0, pdata); } static inline struct device_d *imx31_add_spi1(struct spi_imx_master *pdata) { - return imx_add_spi_imx27((void *)MX31_CSPI2_BASE_ADDR, 1, pdata); + return imx_add_spi_imx35((void *)MX31_CSPI2_BASE_ADDR, 1, pdata); } static inline struct device_d *imx31_add_spi2(struct spi_imx_master *pdata) { - return imx_add_spi_imx27((void *)MX31_CSPI3_BASE_ADDR, 2, pdata); + return imx_add_spi_imx35((void *)MX31_CSPI3_BASE_ADDR, 2, pdata); } static inline struct device_d *imx31_add_uart0(void) diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 738b88ea5e..9a71b3bc25 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -33,7 +33,7 @@ config DRIVER_SPI_IMX_0_0 config DRIVER_SPI_IMX_0_7 bool - depends on ARCH_IMX25 || ARCH_IMX35 || ARCH_IMX53 + depends on ARCH_IMX25 || ARCH_IMX31 || ARCH_IMX35 || ARCH_IMX53 default y config DRIVER_SPI_IMX_2_3 diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c index dc7a8c89f3..806ca67bda 100644 --- a/drivers/spi/imx_spi.c +++ b/drivers/spi/imx_spi.c @@ -206,7 +206,12 @@ static void cspi_0_7_chipselect(struct spi_device *spi, int is_active) reg |= spi_imx_clkdiv_2(clk_get_rate(imx->clk), spi->max_speed_hz) << CSPI_0_7_CTRL_DR_SHIFT; - reg |= (spi->bits_per_word - 1) << CSPI_0_7_CTRL_BL_SHIFT; + if (cpu_is_mx31()) + reg |= ((spi->bits_per_word - 1) & CSPI_0_4_CTRL_BL_MASK) + << CSPI_0_4_CTRL_BL_SHIFT; + else + reg |= (spi->bits_per_word - 1) << CSPI_0_7_CTRL_BL_SHIFT; + reg |= CSPI_0_7_CTRL_SSCTL; if (spi->mode & SPI_CPHA) @@ -215,8 +220,12 @@ static void cspi_0_7_chipselect(struct spi_device *spi, int is_active) reg |= CSPI_0_7_CTRL_POL; if (spi->mode & SPI_CS_HIGH) reg |= CSPI_0_7_CTRL_SSPOL; - if (gpio < 0) - reg |= (gpio + 32) << CSPI_0_7_CTRL_CS_SHIFT; + if (gpio < 0) { + if (cpu_is_mx31()) + reg |= (gpio + 32) << CSPI_0_4_CTRL_CS_SHIFT; + else + reg |= (gpio + 32) << CSPI_0_7_CTRL_CS_SHIFT; + } writel(reg, base + CSPI_0_7_CTRL); diff --git a/include/spi/imx-spi.h b/include/spi/imx-spi.h index 221c66502f..a592573e62 100644 --- a/include/spi/imx-spi.h +++ b/include/spi/imx-spi.h @@ -40,6 +40,12 @@ #define CSPI_0_0_RESET_START (1 << 0) +#define CSPI_0_4_CTRL 0x08 +#define CSPI_0_4_CTRL_BL_SHIFT 8 +#define CSPI_0_4_CTRL_BL_MASK 0x1f +#define CSPI_0_4_CTRL_DRCTL_SHIFT 20 +#define CSPI_0_4_CTRL_CS_SHIFT 24 + #define CSPI_0_7_RXDATA 0x00 #define CSPI_0_7_TXDATA 0x04 #define CSPI_0_7_CTRL 0x08 @@ -50,6 +56,7 @@ #define CSPI_0_7_CTRL_PHA (1 << 5) #define CSPI_0_7_CTRL_SSCTL (1 << 6) #define CSPI_0_7_CTRL_SSPOL (1 << 7) +#define CSPI_0_7_CTRL_DRCTL_SHIFT 8 #define CSPI_0_7_CTRL_CS_SHIFT 12 #define CSPI_0_7_CTRL_DR_SHIFT 16 #define CSPI_0_7_CTRL_BL_SHIFT 20 |