Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-s5pv310 / include / mach / dma.h

diff --git a/arch/arm/mach-pxa/include/mach/pxa2xx_spi.h b/arch/arm/mach-s5pv310/include/mach/dma.h
similarity index 50%
rename from arch/arm/mach-pxa/include/mach/pxa2xx_spi.h
rename to arch/arm/mach-s5pv310/include/mach/dma.h
index b87cecd9bbdc08fda122ed5842d7403af4be0f73..81209eb1409b7ad4c55a70897379547991ea2958 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/pxa2xx_spi.h
+++ b/arch/arm/mach-s5pv310/include/mach/dma.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2005 Stephen Street / StreetFire Sound Labs
+ * Copyright (C) 2010 Samsung Electronics Co. Ltd.
+ *     Jaswinder Singh <jassi.brar@samsung.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,32 +17,10 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef PXA2XX_SPI_H_
-#define PXA2XX_SPI_H_
+#ifndef __MACH_DMA_H
+#define __MACH_DMA_H
 
-#define PXA2XX_CS_ASSERT (0x01)
-#define PXA2XX_CS_DEASSERT (0x02)
+/* This platform uses the common S3C DMA API driver for PL330 */
+#include <plat/s3c-dma-pl330.h>
 
-/* device.platform_data for SSP controller devices */
-struct pxa2xx_spi_master {
-       u32 clock_enable;
-       u16 num_chipselect;
-       u8 enable_dma;
-};
-
-/* spi_board_info.controller_data for SPI slave devices,
- * copied to spi_device.platform_data ... mostly for dma tuning
- */
-struct pxa2xx_spi_chip {
-       u8 tx_threshold;
-       u8 rx_threshold;
-       u8 dma_burst_size;
-       u32 timeout;
-       u8 enable_loopback;
-       int gpio_cs;
-       void (*cs_control)(u32 command);
-};
-
-extern void pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info);
-
-#endif /*PXA2XX_SPI_H_*/
+#endif /* __MACH_DMA_H */