spi: omap2_mcspi handles omap3 too
PATCH 1/1 spi: omap2_mcspi handles omap3 too
From: "Girish" <[email protected]>
This adds driver OMAP SPI specific changes to support OMAP 3430
Signed-off-by Girish S G <[email protected]>
---
There are also some related platform changes. Plus eventually this config symbol should change (probably to OMAP_MCSPI).
drivers/spi/Kconfig | 6 +++--- drivers/spi/omap2_mcspi.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 4 deletions(-)
drivers/spi/Kconfig +3 -3
@@ -151,10 +151,10 @@ config SPI_OMAP_UWIRE This hooks up to the MicroWire controller on OMAP1 chips. config SPI_OMAP24XX - tristate "McSPI driver for OMAP24xx" - depends on SPI_MASTER && ARCH_OMAP24XX + tristate "McSPI driver for OMAP24xx/OMAP34xx" + depends on SPI_MASTER && (ARCH_OMAP24XX || ARCH_OMAP34XX) help - SPI master controller for OMAP24xx Multichannel SPI + SPI master controller for OMAP24xx/OMAP34xx Multichannel SPI (McSPI) modules. config SPI_PXA2XX
drivers/spi/omap2_mcspi.c +36 -1
@@ -915,6 +915,28 @@ static u8 __initdata spi2_txdma_id[] = { OMAP24XX_DMA_SPI2_TX1, }; +#if defined(CONFIG_ARCH_OMAP2430 ) || defined(CONFIG_ARCH_OMAP34XX ) +static u8 __initdata spi3_rxdma_id[] = { +OMAP24XX_DMA_SPI3_RX0 , +OMAP24XX_DMA_SPI3_RX1 , +}; + +static u8 __initdata spi3_txdma_id[] = { +OMAP24XX_DMA_SPI3_TX0 , +OMAP24XX_DMA_SPI3_TX1 , +}; +#endif + +#ifdef CONFIG_ARCH_OMAP3 +static u8 __initdata spi4_rxdma_id[] = { +OMAP34XX_DMA_SPI4_RX0 , +}; + +static u8 __initdata spi4_txdma_id[] = { +OMAP34XX_DMA_SPI4_TX0 , +}; +#endif +static int __init omap2_mcspi_probe (struct platform_device *pdev) {struct spi_master *master;
@@ -935,7 +957,20 @@ static int __init omap2_mcspi_probe(stru txdma_id = spi2_txdma_id; num_chipselect =2 ;break ; -/* REVISIT omap2430 has a third McSPI ... */ +#if defined(CONFIG_ARCH_OMAP2430 ) || defined(CONFIG_ARCH_OMAP3 ) +case 3 : + rxdma_id = spi3_rxdma_id; + txdma_id = spi3_txdma_id; + num_chipselect =2 ; +break ; +#endif +#ifdef CONFIG_ARCH_OMAP3 +case 4 : + rxdma_id = spi4_rxdma_id; + txdma_id = spi4_txdma_id; + num_chipselect =1 ; +break ; +#endif default :return -EINVAL ; }
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/