ARM: at91: remove mach/atmel-mci.h
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>
Fri, 17 Oct 2014 08:26:37 +0000 (10:26 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 10 Nov 2014 11:40:37 +0000 (12:40 +0100)
Use the generic platform_data header file instead of mach/atmel-mci.h

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
arch/arm/mach-at91/at91sam9g45_devices.c
arch/arm/mach-at91/include/mach/atmel-mci.h [deleted file]

index 21ab782cc8e90340cfbb2967dbe346b2c6ae0bbb..06ecbafd01ee5ced5aa290c7767ea6230b1cb2de 100644 (file)
@@ -19,6 +19,7 @@
 #include <linux/i2c-gpio.h>
 #include <linux/atmel-mci.h>
 #include <linux/platform_data/crypto-atmel.h>
+#include <linux/platform_data/mmc-atmel-mci.h>
 
 #include <linux/platform_data/at91_adc.h>
 
@@ -30,7 +31,6 @@
 #include <mach/at91_matrix.h>
 #include <mach/at91sam9_smc.h>
 #include <linux/platform_data/dma-atmel.h>
-#include <mach/atmel-mci.h>
 #include <mach/hardware.h>
 
 #include <media/atmel-isi.h>
diff --git a/arch/arm/mach-at91/include/mach/atmel-mci.h b/arch/arm/mach-at91/include/mach/atmel-mci.h
deleted file mode 100644 (file)
index 3069e41..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __MACH_ATMEL_MCI_H
-#define __MACH_ATMEL_MCI_H
-
-#include <linux/platform_data/dma-atmel.h>
-
-/**
- * struct mci_dma_data - DMA data for MCI interface
- */
-struct mci_dma_data {
-       struct at_dma_slave     sdata;
-};
-
-/* accessor macros */
-#define        slave_data_ptr(s)       (&(s)->sdata)
-#define find_slave_dev(s)      ((s)->sdata.dma_dev)
-
-#endif /* __MACH_ATMEL_MCI_H */