mmc: atmel-mci: move mach header to platform_data (9cbef73c) · Commits · 戴 / test

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]

drivers/mmc/host/atmel-mci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,11 +30,11 @@
		#include <linux/stat.h>
		#include <linux/types.h>
		#include <linux/platform_data/atmel.h>
		#include <linux/platform_data/mmc-atmel-mci.h>

		#include <linux/mmc/host.h>
		#include <linux/mmc/sdio.h>

		#include <mach/atmel-mci.h>
		#include <linux/atmel-mci.h>
		#include <linux/atmel_pdc.h>

include/linux/platform_data/mmc-atmel-mci.h

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		#ifndef __MMC_ATMEL_MCI_H
		#define __MMC_ATMEL_MCI_H

		#include <linux/platform_data/dma-atmel.h>
		#include <linux/platform_data/dma-dw.h>

		/**
		* struct mci_dma_data - DMA data for MCI interface
		*/
		struct mci_dma_data {
		#ifdef CONFIG_ARM
		struct at_dma_slave sdata;
		#else
		struct dw_dma_slave sdata;
		#endif
		};

		/* accessor macros */
		#define slave_data_ptr(s) (&(s)->sdata)
		#define find_slave_dev(s) ((s)->sdata.dma_dev)

		#endif /* __MMC_ATMEL_MCI_H */

Admin message