Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: atmel-mci: move mach header to platform_data

Move the mach header that can come either from arm/mach-at91 or avr32 to
platform_data to be able to switch the AT91 platforms to multiplatform.

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>
[Ulf: Fixed compile error]

authored by

Alexandre Belloni and committed by
Ulf Hansson
9cbef73c 0f762426

+23 -1
+1 -1
drivers/mmc/host/atmel-mci.c
··· 30 30 #include <linux/stat.h> 31 31 #include <linux/types.h> 32 32 #include <linux/platform_data/atmel.h> 33 + #include <linux/platform_data/mmc-atmel-mci.h> 33 34 34 35 #include <linux/mmc/host.h> 35 36 #include <linux/mmc/sdio.h> 36 37 37 - #include <mach/atmel-mci.h> 38 38 #include <linux/atmel-mci.h> 39 39 #include <linux/atmel_pdc.h> 40 40
+22
include/linux/platform_data/mmc-atmel-mci.h
··· 1 + #ifndef __MMC_ATMEL_MCI_H 2 + #define __MMC_ATMEL_MCI_H 3 + 4 + #include <linux/platform_data/dma-atmel.h> 5 + #include <linux/platform_data/dma-dw.h> 6 + 7 + /** 8 + * struct mci_dma_data - DMA data for MCI interface 9 + */ 10 + struct mci_dma_data { 11 + #ifdef CONFIG_ARM 12 + struct at_dma_slave sdata; 13 + #else 14 + struct dw_dma_slave sdata; 15 + #endif 16 + }; 17 + 18 + /* accessor macros */ 19 + #define slave_data_ptr(s) (&(s)->sdata) 20 + #define find_slave_dev(s) ((s)->sdata.dma_dev) 21 + 22 + #endif /* __MMC_ATMEL_MCI_H */