Needed to use the atmel-mci driver in a architecture
independent manner.
Signed-off-by: Nicolas Ferre <[email protected]>
---
arch/avr32/boards/atngw100/setup.c | 2 +-
arch/avr32/boards/atstk1000/atstk1002.c | 2 +-
arch/avr32/boards/atstk1000/atstk1003.c | 2 +-
arch/avr32/boards/atstk1000/atstk1004.c | 2 +-
arch/avr32/include/asm/atmel-mci.h | 39 ------
arch/avr32/mach-at32ap/at32ap700x.c | 2 +-
drivers/mmc/host/atmel-mci.c | 2 +-
include/linux/atmel-mci.h | 39 ++++++
8 files changed, 45 insertions(+), 45 deletions(-)
delete mode 100644 arch/avr32/include/asm/atmel-mci.h
create mode 100644 include/linux/atmel-mci.h
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index 6c54580..ca6e1ff 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -19,8 +19,8 @@
#include <linux/types.h>
#include <linux/leds.h>
#include <linux/spi/spi.h>
+#include <linux/atmel-mci.h>
-#include <asm/atmel-mci.h>
#include <asm/io.h>
#include <asm/setup.h>
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 29e5b51..5a6380f 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -16,12 +16,12 @@
#include <linux/types.h>
#include <linux/spi/spi.h>
#include <linux/spi/at73c213.h>
+#include <linux/atmel-mci.h>
#include <video/atmel_lcdc.h>
#include <asm/io.h>
#include <asm/setup.h>
-#include <asm/atmel-mci.h>
#include <mach/at32ap700x.h>
#include <mach/board.h>
diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c
index be089d7..7b9ceee 100644
--- a/arch/avr32/boards/atstk1000/atstk1003.c
+++ b/arch/avr32/boards/atstk1000/atstk1003.c
@@ -17,9 +17,9 @@
#include <linux/spi/at73c213.h>
#include <linux/spi/spi.h>
+#include <linux/atmel-mci.h>
#include <asm/setup.h>
-#include <asm/atmel-mci.h>
#include <mach/at32ap700x.h>
#include <mach/board.h>
diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c
index 248ef23..3ff0498 100644
--- a/arch/avr32/boards/atstk1000/atstk1004.c
+++ b/arch/avr32/boards/atstk1000/atstk1004.c
@@ -17,11 +17,11 @@
#include <linux/spi/at73c213.h>
#include <linux/spi/spi.h>
+#include <linux/atmel-mci.h>
#include <video/atmel_lcdc.h>
#include <asm/setup.h>
-#include <asm/atmel-mci.h>
#include <mach/at32ap700x.h>
#include <mach/board.h>
diff --git a/arch/avr32/include/asm/atmel-mci.h b/arch/avr32/include/asm/atmel-mci.h
deleted file mode 100644
index 59f3fad..0000000
--- a/arch/avr32/include/asm/atmel-mci.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef __ASM_AVR32_ATMEL_MCI_H
-#define __ASM_AVR32_ATMEL_MCI_H
-
-#define ATMEL_MCI_MAX_NR_SLOTS 2
-
-struct dma_slave;
-
-/**
- * struct mci_slot_pdata - board-specific per-slot configuration
- * @bus_width: Number of data lines wired up the slot
- * @detect_pin: GPIO pin wired to the card detect switch
- * @wp_pin: GPIO pin wired to the write protect sensor
- *
- * If a given slot is not present on the board, @bus_width should be
- * set to 0. The other fields are ignored in this case.
- *
- * Any pins that aren't available should be set to a negative value.
- *
- * Note that support for multiple slots is experimental -- some cards
- * might get upset if we don't get the clock management exactly right.
- * But in most cases, it should work just fine.
- */
-struct mci_slot_pdata {
- unsigned int bus_width;
- int detect_pin;
- int wp_pin;
-};
-
-/**
- * struct mci_platform_data - board-specific MMC/SDcard configuration
- * @dma_slave: DMA slave interface to use in data transfers, or NULL.
- * @slot: Per-slot configuration data.
- */
-struct mci_platform_data {
- struct dma_slave *dma_slave;
- struct mci_slot_pdata slot[ATMEL_MCI_MAX_NR_SLOTS];
-};
-
-#endif /* __ASM_AVR32_ATMEL_MCI_H */
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 813b684..b0ad6da 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -15,8 +15,8 @@
#include <linux/gpio.h>
#include <linux/spi/spi.h>
#include <linux/usb/atmel_usba_udc.h>
+#include <linux/atmel-mci.h>
-#include <asm/atmel-mci.h>
#include <asm/io.h>
#include <asm/irq.h>
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 7a3f243..1e97916 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -25,8 +25,8 @@
#include <linux/stat.h>
#include <linux/mmc/host.h>
+#include <linux/atmel-mci.h>
-#include <asm/atmel-mci.h>
#include <asm/io.h>
#include <asm/unaligned.h>
diff --git a/include/linux/atmel-mci.h b/include/linux/atmel-mci.h
new file mode 100644
index 0000000..2a2213e
--- /dev/null
+++ b/include/linux/atmel-mci.h
@@ -0,0 +1,39 @@
+#ifndef __LINUX_ATMEL_MCI_H
+#define __LINUX_ATMEL_MCI_H
+
+#define ATMEL_MCI_MAX_NR_SLOTS 2
+
+struct dma_slave;
+
+/**
+ * struct mci_slot_pdata - board-specific per-slot configuration
+ * @bus_width: Number of data lines wired up the slot
+ * @detect_pin: GPIO pin wired to the card detect switch
+ * @wp_pin: GPIO pin wired to the write protect sensor
+ *
+ * If a given slot is not present on the board, @bus_width should be
+ * set to 0. The other fields are ignored in this case.
+ *
+ * Any pins that aren't available should be set to a negative value.
+ *
+ * Note that support for multiple slots is experimental -- some cards
+ * might get upset if we don't get the clock management exactly right.
+ * But in most cases, it should work just fine.
+ */
+struct mci_slot_pdata {
+ unsigned int bus_width;
+ int detect_pin;
+ int wp_pin;
+};
+
+/**
+ * struct mci_platform_data - board-specific MMC/SDcard configuration
+ * @dma_slave: DMA slave interface to use in data transfers, or NULL.
+ * @slot: Per-slot configuration data.
+ */
+struct mci_platform_data {
+ struct dma_slave *dma_slave;
+ struct mci_slot_pdata slot[ATMEL_MCI_MAX_NR_SLOTS];
+};
+
+#endif /* __LINUX_ATMEL_MCI_H */
--
1.5.3.7
--
Nicolas Ferre
Nicolas Ferre <[email protected]> wrote:
> Needed to use the atmel-mci driver in a architecture
> independent manner.
>
> Signed-off-by: Nicolas Ferre <[email protected]>
> ---
> arch/avr32/boards/atngw100/setup.c | 2 +-
> arch/avr32/boards/atstk1000/atstk1002.c | 2 +-
> arch/avr32/boards/atstk1000/atstk1003.c | 2 +-
> arch/avr32/boards/atstk1000/atstk1004.c | 2 +-
> arch/avr32/include/asm/atmel-mci.h | 39 ------
> arch/avr32/mach-at32ap/at32ap700x.c | 2 +-
> drivers/mmc/host/atmel-mci.c | 2 +-
> include/linux/atmel-mci.h | 39 ++++++
> 8 files changed, 45 insertions(+), 45 deletions(-)
> delete mode 100644 arch/avr32/include/asm/atmel-mci.h
> create mode 100644 include/linux/atmel-mci.h
Please fix up the mimc200 board too. If you do that, feel free to add
Acked-by: Haavard Skinnemoen <[email protected]>
On Thu, Nov 13, 2008 at 12:14:13PM +0100, Nicolas Ferre wrote:
> Needed to use the atmel-mci driver in a architecture
> independent manner.
>
> Signed-off-by: Nicolas Ferre <[email protected]>
> ---
> arch/avr32/boards/atngw100/setup.c | 2 +-
> arch/avr32/boards/atstk1000/atstk1002.c | 2 +-
> arch/avr32/boards/atstk1000/atstk1003.c | 2 +-
> arch/avr32/boards/atstk1000/atstk1004.c | 2 +-
> arch/avr32/include/asm/atmel-mci.h | 39 ------
> arch/avr32/mach-at32ap/at32ap700x.c | 2 +-
> drivers/mmc/host/atmel-mci.c | 2 +-
> include/linux/atmel-mci.h | 39 ++++++
Would people object to putting this in include/linux/mmc/atmel.h
to avoid making include/linux abound with device/subsystem/machine
specific header files?
> 8 files changed, 45 insertions(+), 45 deletions(-)
> delete mode 100644 arch/avr32/include/asm/atmel-mci.h
> create mode 100644 include/linux/atmel-mci.h
>
> diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
> index 6c54580..ca6e1ff 100644
> --- a/arch/avr32/boards/atngw100/setup.c
> +++ b/arch/avr32/boards/atngw100/setup.c
> @@ -19,8 +19,8 @@
> #include <linux/types.h>
> #include <linux/leds.h>
> #include <linux/spi/spi.h>
> +#include <linux/atmel-mci.h>
>
> -#include <asm/atmel-mci.h>
> #include <asm/io.h>
> #include <asm/setup.h>
>
> diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
> index 29e5b51..5a6380f 100644
> --- a/arch/avr32/boards/atstk1000/atstk1002.c
> +++ b/arch/avr32/boards/atstk1000/atstk1002.c
> @@ -16,12 +16,12 @@
> #include <linux/types.h>
> #include <linux/spi/spi.h>
> #include <linux/spi/at73c213.h>
> +#include <linux/atmel-mci.h>
>
> #include <video/atmel_lcdc.h>
>
> #include <asm/io.h>
> #include <asm/setup.h>
> -#include <asm/atmel-mci.h>
>
> #include <mach/at32ap700x.h>
> #include <mach/board.h>
> diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c
> index be089d7..7b9ceee 100644
> --- a/arch/avr32/boards/atstk1000/atstk1003.c
> +++ b/arch/avr32/boards/atstk1000/atstk1003.c
> @@ -17,9 +17,9 @@
>
> #include <linux/spi/at73c213.h>
> #include <linux/spi/spi.h>
> +#include <linux/atmel-mci.h>
>
> #include <asm/setup.h>
> -#include <asm/atmel-mci.h>
>
> #include <mach/at32ap700x.h>
> #include <mach/board.h>
> diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c
> index 248ef23..3ff0498 100644
> --- a/arch/avr32/boards/atstk1000/atstk1004.c
> +++ b/arch/avr32/boards/atstk1000/atstk1004.c
> @@ -17,11 +17,11 @@
>
> #include <linux/spi/at73c213.h>
> #include <linux/spi/spi.h>
> +#include <linux/atmel-mci.h>
>
> #include <video/atmel_lcdc.h>
>
> #include <asm/setup.h>
> -#include <asm/atmel-mci.h>
>
> #include <mach/at32ap700x.h>
> #include <mach/board.h>
> diff --git a/arch/avr32/include/asm/atmel-mci.h b/arch/avr32/include/asm/atmel-mci.h
> deleted file mode 100644
> index 59f3fad..0000000
> --- a/arch/avr32/include/asm/atmel-mci.h
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -#ifndef __ASM_AVR32_ATMEL_MCI_H
> -#define __ASM_AVR32_ATMEL_MCI_H
> -
> -#define ATMEL_MCI_MAX_NR_SLOTS 2
> -
> -struct dma_slave;
> -
> -/**
> - * struct mci_slot_pdata - board-specific per-slot configuration
> - * @bus_width: Number of data lines wired up the slot
> - * @detect_pin: GPIO pin wired to the card detect switch
> - * @wp_pin: GPIO pin wired to the write protect sensor
> - *
> - * If a given slot is not present on the board, @bus_width should be
> - * set to 0. The other fields are ignored in this case.
> - *
> - * Any pins that aren't available should be set to a negative value.
> - *
> - * Note that support for multiple slots is experimental -- some cards
> - * might get upset if we don't get the clock management exactly right.
> - * But in most cases, it should work just fine.
> - */
> -struct mci_slot_pdata {
> - unsigned int bus_width;
> - int detect_pin;
> - int wp_pin;
> -};
> -
> -/**
> - * struct mci_platform_data - board-specific MMC/SDcard configuration
> - * @dma_slave: DMA slave interface to use in data transfers, or NULL.
> - * @slot: Per-slot configuration data.
> - */
> -struct mci_platform_data {
> - struct dma_slave *dma_slave;
> - struct mci_slot_pdata slot[ATMEL_MCI_MAX_NR_SLOTS];
> -};
> -
> -#endif /* __ASM_AVR32_ATMEL_MCI_H */
> diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
> index 813b684..b0ad6da 100644
> --- a/arch/avr32/mach-at32ap/at32ap700x.c
> +++ b/arch/avr32/mach-at32ap/at32ap700x.c
> @@ -15,8 +15,8 @@
> #include <linux/gpio.h>
> #include <linux/spi/spi.h>
> #include <linux/usb/atmel_usba_udc.h>
> +#include <linux/atmel-mci.h>
>
> -#include <asm/atmel-mci.h>
> #include <asm/io.h>
> #include <asm/irq.h>
>
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index 7a3f243..1e97916 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -25,8 +25,8 @@
> #include <linux/stat.h>
>
> #include <linux/mmc/host.h>
> +#include <linux/atmel-mci.h>
>
> -#include <asm/atmel-mci.h>
> #include <asm/io.h>
> #include <asm/unaligned.h>
>
> diff --git a/include/linux/atmel-mci.h b/include/linux/atmel-mci.h
> new file mode 100644
> index 0000000..2a2213e
> --- /dev/null
> +++ b/include/linux/atmel-mci.h
> @@ -0,0 +1,39 @@
> +#ifndef __LINUX_ATMEL_MCI_H
> +#define __LINUX_ATMEL_MCI_H
> +
> +#define ATMEL_MCI_MAX_NR_SLOTS 2
> +
> +struct dma_slave;
> +
> +/**
> + * struct mci_slot_pdata - board-specific per-slot configuration
> + * @bus_width: Number of data lines wired up the slot
> + * @detect_pin: GPIO pin wired to the card detect switch
> + * @wp_pin: GPIO pin wired to the write protect sensor
> + *
> + * If a given slot is not present on the board, @bus_width should be
> + * set to 0. The other fields are ignored in this case.
> + *
> + * Any pins that aren't available should be set to a negative value.
> + *
> + * Note that support for multiple slots is experimental -- some cards
> + * might get upset if we don't get the clock management exactly right.
> + * But in most cases, it should work just fine.
> + */
> +struct mci_slot_pdata {
> + unsigned int bus_width;
> + int detect_pin;
> + int wp_pin;
> +};
> +
> +/**
> + * struct mci_platform_data - board-specific MMC/SDcard configuration
> + * @dma_slave: DMA slave interface to use in data transfers, or NULL.
> + * @slot: Per-slot configuration data.
> + */
> +struct mci_platform_data {
> + struct dma_slave *dma_slave;
> + struct mci_slot_pdata slot[ATMEL_MCI_MAX_NR_SLOTS];
> +};
> +
> +#endif /* __LINUX_ATMEL_MCI_H */
> --
> 1.5.3.7
>
>
>
> --
> Nicolas Ferre
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
Ben ([email protected], http://www.fluff.org/)
'a smiley only costs 4 bytes'
Ben Dooks :
> On Thu, Nov 13, 2008 at 12:14:13PM +0100, Nicolas Ferre wrote:
>> Needed to use the atmel-mci driver in a architecture
>> independent manner.
>>
>> Signed-off-by: Nicolas Ferre <[email protected]>
>> ---
>> arch/avr32/boards/atngw100/setup.c | 2 +-
>> arch/avr32/boards/atstk1000/atstk1002.c | 2 +-
>> arch/avr32/boards/atstk1000/atstk1003.c | 2 +-
>> arch/avr32/boards/atstk1000/atstk1004.c | 2 +-
>> arch/avr32/include/asm/atmel-mci.h | 39 ------
>> arch/avr32/mach-at32ap/at32ap700x.c | 2 +-
>> drivers/mmc/host/atmel-mci.c | 2 +-
>> include/linux/atmel-mci.h | 39 ++++++
>
> Would people object to putting this in include/linux/mmc/atmel.h
> to avoid making include/linux abound with device/subsystem/machine
> specific header files?
I tend to agree *but* it seems that header files in include/linux/mmc
are mostly sd/mmc subsystem core files (I mean, not driver ones).
Although, a bunch of atmel-a_driver.h files are already in include/linux...
Pierre, a comment ?
Regards,
--
Nicolas Ferre
On Thu, 13 Nov 2008 15:43:34 +0100
Nicolas Ferre <[email protected]> wrote:
> Ben Dooks :
> >
> > Would people object to putting this in include/linux/mmc/atmel.h
> > to avoid making include/linux abound with device/subsystem/machine
> > specific header files?
>
> I tend to agree *but* it seems that header files in include/linux/mmc
> are mostly sd/mmc subsystem core files (I mean, not driver ones).
> Although, a bunch of atmel-a_driver.h files are already in include/linux...
>
> Pierre, a comment ?
>
I'd prefer if include/linux/mmc could stay clean and just have core
stuff since the header files are basically the reference documentation
for the subsystem. But if you can't find any other way...
--
-- Pierre Ossman
WARNING: This correspondence is being monitored by the
Swedish government. Make sure your server uses encryption
for SMTP traffic and consider using PGP for end-to-end
encryption.
Pierre Ossman :
> On Thu, 13 Nov 2008 15:43:34 +0100
> Nicolas Ferre <[email protected]> wrote:
>
>> Ben Dooks :
>>> Would people object to putting this in include/linux/mmc/atmel.h
>>> to avoid making include/linux abound with device/subsystem/machine
>>> specific header files?
>> I tend to agree *but* it seems that header files in include/linux/mmc
>> are mostly sd/mmc subsystem core files (I mean, not driver ones).
>> Although, a bunch of atmel-a_driver.h files are already in include/linux...
>>
>> Pierre, a comment ?
>>
>
> I'd prefer if include/linux/mmc could stay clean and just have core
> stuff since the header files are basically the reference documentation
> for the subsystem. But if you can't find any other way...
I agree with both of you Pierre and Antonio.
Haavard, I submit a patch which also fix the mimc200 board very soon now.
Bye,
--
Nicolas Ferre
Nicolas Ferre <[email protected]> wrote:
> I agree with both of you Pierre and Antonio.
> Haavard, I submit a patch which also fix the mimc200 board very soon now.
Sounds good to me. Thanks :-)
Haavard
Needed to use the atmel-mci driver in an architecture
independant maner.
Signed-off-by: Nicolas Ferre <[email protected]>
Acked-by: Haavard Skinnemoen <[email protected]>
---
V2: add mimc200 board.
Beware: embeds a git mv of atmel-mci.h
arch/avr32/boards/atngw100/setup.c | 2 +-
arch/avr32/boards/atstk1000/atstk1002.c | 2 +-
arch/avr32/boards/atstk1000/atstk1003.c | 2 +-
arch/avr32/boards/atstk1000/atstk1004.c | 2 +-
arch/avr32/boards/mimc200/setup.c | 2 +-
arch/avr32/mach-at32ap/at32ap700x.c | 2 +-
drivers/mmc/host/atmel-mci.c | 2 +-
.../include/asm => include/linux}/atmel-mci.h | 6 +++---
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index 32fb9ba..05d3722 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -19,8 +19,8 @@
#include <linux/types.h>
#include <linux/leds.h>
#include <linux/spi/spi.h>
+#include <linux/atmel-mci.h>
-#include <asm/atmel-mci.h>
#include <asm/io.h>
#include <asm/setup.h>
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 5c5cdf3..6d94f74 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -16,12 +16,12 @@
#include <linux/types.h>
#include <linux/spi/spi.h>
#include <linux/spi/at73c213.h>
+#include <linux/atmel-mci.h>
#include <video/atmel_lcdc.h>
#include <asm/io.h>
#include <asm/setup.h>
-#include <asm/atmel-mci.h>
#include <mach/at32ap700x.h>
#include <mach/board.h>
diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c
index 134b566..db2038c 100644
--- a/arch/avr32/boards/atstk1000/atstk1003.c
+++ b/arch/avr32/boards/atstk1000/atstk1003.c
@@ -17,9 +17,9 @@
#include <linux/spi/at73c213.h>
#include <linux/spi/spi.h>
+#include <linux/atmel-mci.h>
#include <asm/setup.h>
-#include <asm/atmel-mci.h>
#include <mach/at32ap700x.h>
#include <mach/board.h>
diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c
index cb32eb8..29b35ac 100644
--- a/arch/avr32/boards/atstk1000/atstk1004.c
+++ b/arch/avr32/boards/atstk1000/atstk1004.c
@@ -17,11 +17,11 @@
#include <linux/spi/at73c213.h>
#include <linux/spi/spi.h>
+#include <linux/atmel-mci.h>
#include <video/atmel_lcdc.h>
#include <asm/setup.h>
-#include <asm/atmel-mci.h>
#include <mach/at32ap700x.h>
#include <mach/board.h>
diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c
index 397cbb8..811d730 100644
--- a/arch/avr32/boards/mimc200/setup.c
+++ b/arch/avr32/boards/mimc200/setup.c
@@ -24,7 +24,7 @@ extern struct atmel_lcdfb_info mimc200_lcdc_data;
#include <video/atmel_lcdc.h>
#include <linux/fb.h>
-#include <asm/atmel-mci.h>
+#include <linux/atmel-mci.h>
#include <linux/io.h>
#include <asm/setup.h>
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 0c6e02f..bc95ba7 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -15,8 +15,8 @@
#include <linux/gpio.h>
#include <linux/spi/spi.h>
#include <linux/usb/atmel_usba_udc.h>
+#include <linux/atmel-mci.h>
-#include <asm/atmel-mci.h>
#include <asm/io.h>
#include <asm/irq.h>
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 7a3f243..1e97916 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -25,8 +25,8 @@
#include <linux/stat.h>
#include <linux/mmc/host.h>
+#include <linux/atmel-mci.h>
-#include <asm/atmel-mci.h>
#include <asm/io.h>
#include <asm/unaligned.h>
diff --git a/arch/avr32/include/asm/atmel-mci.h b/include/linux/atmel-mci.h
similarity index 91%
rename from arch/avr32/include/asm/atmel-mci.h
rename to include/linux/atmel-mci.h
index 59f3fad..2a2213e 100644
--- a/arch/avr32/include/asm/atmel-mci.h
+++ b/include/linux/atmel-mci.h
@@ -1,5 +1,5 @@
-#ifndef __ASM_AVR32_ATMEL_MCI_H
-#define __ASM_AVR32_ATMEL_MCI_H
+#ifndef __LINUX_ATMEL_MCI_H
+#define __LINUX_ATMEL_MCI_H
#define ATMEL_MCI_MAX_NR_SLOTS 2
@@ -36,4 +36,4 @@ struct mci_platform_data {
struct mci_slot_pdata slot[ATMEL_MCI_MAX_NR_SLOTS];
};
-#endif /* __ASM_AVR32_ATMEL_MCI_H */
+#endif /* __LINUX_ATMEL_MCI_H */
--
1.5.3.7
On Thu, 20 Nov 2008 15:59:12 +0100
Nicolas Ferre <[email protected]> wrote:
> Needed to use the atmel-mci driver in an architecture
> independant maner.
>
> Signed-off-by: Nicolas Ferre <[email protected]>
> Acked-by: Haavard Skinnemoen <[email protected]>
> ---
Colour me confused. Shouldn't this go through Haavard?
--
-- Pierre Ossman
WARNING: This correspondence is being monitored by the
Swedish government. Make sure your server uses encryption
for SMTP traffic and consider using PGP for end-to-end
encryption.
Pierre Ossman wrote:
> On Thu, 20 Nov 2008 15:59:12 +0100
> Nicolas Ferre <[email protected]> wrote:
>
> > Needed to use the atmel-mci driver in an architecture
> > independant maner.
> >
> > Signed-off-by: Nicolas Ferre <[email protected]>
> > Acked-by: Haavard Skinnemoen <[email protected]>
> > ---
>
> Colour me confused. Shouldn't this go through Haavard?
You're right. I've applied it to the avr32 tree. Thanks!
Haavard