Skip to content

Commit

Permalink
mmc: atmel-mci: move mach header to platform_data
Browse files Browse the repository at this point in the history
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]
  • Loading branch information
Alexandre Belloni authored and Ulf Hansson committed Nov 10, 2014
1 parent 0f76242 commit 9cbef73
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/mmc/host/atmel-mci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
22 changes: 22 additions & 0 deletions include/linux/platform_data/mmc-atmel-mci.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#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 */

0 comments on commit 9cbef73

Please sign in to comment.