diff options
Diffstat (limited to 'drivers/spi/omap2_mcspi.c')
-rw-r--r-- | drivers/spi/omap2_mcspi.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c index 85b7aea73374..ba1a872b221e 100644 --- a/drivers/spi/omap2_mcspi.c +++ b/drivers/spi/omap2_mcspi.c | |||
@@ -1014,7 +1014,8 @@ static u8 __initdata spi2_txdma_id[] = { | |||
1014 | OMAP24XX_DMA_SPI2_TX1, | 1014 | OMAP24XX_DMA_SPI2_TX1, |
1015 | }; | 1015 | }; |
1016 | 1016 | ||
1017 | #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) | 1017 | #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) \ |
1018 | || defined(CONFIG_ARCH_OMAP4) | ||
1018 | static u8 __initdata spi3_rxdma_id[] = { | 1019 | static u8 __initdata spi3_rxdma_id[] = { |
1019 | OMAP24XX_DMA_SPI3_RX0, | 1020 | OMAP24XX_DMA_SPI3_RX0, |
1020 | OMAP24XX_DMA_SPI3_RX1, | 1021 | OMAP24XX_DMA_SPI3_RX1, |
@@ -1026,7 +1027,7 @@ static u8 __initdata spi3_txdma_id[] = { | |||
1026 | }; | 1027 | }; |
1027 | #endif | 1028 | #endif |
1028 | 1029 | ||
1029 | #ifdef CONFIG_ARCH_OMAP3 | 1030 | #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) |
1030 | static u8 __initdata spi4_rxdma_id[] = { | 1031 | static u8 __initdata spi4_rxdma_id[] = { |
1031 | OMAP34XX_DMA_SPI4_RX0, | 1032 | OMAP34XX_DMA_SPI4_RX0, |
1032 | }; | 1033 | }; |
@@ -1056,14 +1057,15 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) | |||
1056 | txdma_id = spi2_txdma_id; | 1057 | txdma_id = spi2_txdma_id; |
1057 | num_chipselect = 2; | 1058 | num_chipselect = 2; |
1058 | break; | 1059 | break; |
1059 | #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) | 1060 | #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \ |
1061 | || defined(CONFIG_ARCH_OMAP4) | ||
1060 | case 3: | 1062 | case 3: |
1061 | rxdma_id = spi3_rxdma_id; | 1063 | rxdma_id = spi3_rxdma_id; |
1062 | txdma_id = spi3_txdma_id; | 1064 | txdma_id = spi3_txdma_id; |
1063 | num_chipselect = 2; | 1065 | num_chipselect = 2; |
1064 | break; | 1066 | break; |
1065 | #endif | 1067 | #endif |
1066 | #ifdef CONFIG_ARCH_OMAP3 | 1068 | #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) |
1067 | case 4: | 1069 | case 4: |
1068 | rxdma_id = spi4_rxdma_id; | 1070 | rxdma_id = spi4_rxdma_id; |
1069 | txdma_id = spi4_txdma_id; | 1071 | txdma_id = spi4_txdma_id; |