[PATCHv2 1/3] mmc: atmel-mci: move mache header to platform_data

[Ulf Hansson]

On 27 October 2014 15:46, Ulf Hansson <ulf.hansson at linaro.org> wrote:
> On 17 October 2014 10:26, Alexandre Belloni
> <alexandre.belloni at free-electrons.com> wrote:
>> 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 at free-electrons.com>
>
> Thanks! Applied for next!

Actually this one caused a compiler error due to a moved header from
the below commit.

3d598f47e804 dmaengine: dw: move dw_dmac.h to where it belongs to

I decided to fix it myself and fold the change into this patch, see below.

>
> Kind regards
> Uffe
>
>> ---
>>  drivers/mmc/host/atmel-mci.c                |  2 +-
>>  include/linux/platform_data/mmc-atmel-mci.h | 22 ++++++++++++++++++++++
>>  2 files changed, 23 insertions(+), 1 deletion(-)
>>  create mode 100644 include/linux/platform_data/mmc-atmel-mci.h
>>
>> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
>> index bb585d940901..b1231835b031 100644
>> --- a/drivers/mmc/host/atmel-mci.c
>> +++ b/drivers/mmc/host/atmel-mci.c
>> @@ -29,11 +29,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>
>>
>> diff --git a/include/linux/platform_data/mmc-atmel-mci.h b/include/linux/platform_data/mmc-atmel-mci.h
>> new file mode 100644
>> index 000000000000..ebe7ae4f72e4
>> --- /dev/null
>> +++ b/include/linux/platform_data/mmc-atmel-mci.h
>> @@ -0,0 +1,22 @@
>> +#ifndef __MMC_ATMEL_MCI_H
>> +#define __MMC_ATMEL_MCI_H
>> +
>> +#include <linux/platform_data/dma-atmel.h>
>> +#include <linux/dw_dmac.h>

Changed to:

<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 */
>> --
>> 1.9.1
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo at vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/