Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b27a1a5 authored by Nicolas Ferre's avatar Nicolas Ferre Committed by Linus Torvalds
Browse files

mmc: at91_mci: introduce per-mci-revision conditional code 



We used to manage features and differences on a per-cpu basis.  As several
cpus share the same mci revision, this patch aggregates cpus that have the
same IP revision in one defined constant.  We use the
at91mci_is_mci1rev2xx() funtion name not to mess with newer Atmel sd/mmc
IP called "MCI2".  _rev2 naming could have been confusing...

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Cc: Wolfgang Muees <wolfgang.mues@auerswald.de>
Cc: Andrew Victor <avictor.za@gmail.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 541e7ef0

drivers/mmc/host/at91_mci.c

+19 −8
Original line number Diff line number Diff line
@@ -78,6 +78,17 @@ 


#define DRIVER_NAME "at91_mci"



static inline int at91mci_is_mci1rev2xx(void)

{

	return (   cpu_is_at91sam9260()

		|| cpu_is_at91sam9263()

		|| cpu_is_at91cap9()

		|| cpu_is_at91sam9rl()

		|| cpu_is_at91sam9g10()

		|| cpu_is_at91sam9g20()

		);

}



#define FL_SENT_COMMAND	(1 << 0)

#define FL_SENT_STOP	(1 << 1)
@@ -204,8 +215,8 @@ static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data 
	size = data->blksz * data->blocks;

	len = data->sg_len;



	/* AT91SAM926[0/3] Data Write Operation and number of bytes erratum */

	if (cpu_is_at91sam9260() || cpu_is_at91sam9263())

	/* MCI1 rev2xx Data Write Operation and number of bytes erratum */

	if (at91mci_is_mci1rev2xx())

		if (host->total_length == 12)

			memset(dmabuf, 0, 12);
@@ -398,7 +409,7 @@ static void at91_mci_enable(struct at91mci_host *host) 
	at91_mci_write(host, AT91_MCI_DTOR, AT91_MCI_DTOMUL_1M | AT91_MCI_DTOCYC);

	mr = AT91_MCI_PDCMODE | 0x34a;



	if (cpu_is_at91sam9260() || cpu_is_at91sam9263())

	if (at91mci_is_mci1rev2xx())

		mr |= AT91_MCI_RDPROOF | AT91_MCI_WRPROOF;



	at91_mci_write(host, AT91_MCI_MR, mr);
@@ -555,10 +566,10 @@ static void at91_mci_send_command(struct at91mci_host *host, struct mmc_command 
				 */

				host->total_length = block_length * blocks;

				/*

				 * AT91SAM926[0/3] Data Write Operation and

				 * MCI1 rev2xx Data Write Operation and

				 * number of bytes erratum

				 */

				if (cpu_is_at91sam9260 () || cpu_is_at91sam9263())

				if (at91mci_is_mci1rev2xx())

					if (host->total_length < 12)

						host->total_length = 12;
@@ -943,7 +954,7 @@ static int __init at91_mci_probe(struct platform_device *pdev) 
	host->bus_mode = 0;

	host->board = pdev->dev.platform_data;

	if (host->board->wire4) {

		if (cpu_is_at91sam9260() || cpu_is_at91sam9263())

		if (at91mci_is_mci1rev2xx())

			mmc->caps |= MMC_CAP_4_BIT_DATA;

		else

			dev_warn(&pdev->dev, "4 wire bus mode not supported"
@@ -959,8 +970,8 @@ static int __init at91_mci_probe(struct platform_device *pdev) 
	}



	/* Add SDIO capability when available */

	if (cpu_is_at91sam9260() || cpu_is_at91sam9263()) {

		/* AT91SAM9260/9263 erratum */

	if (at91mci_is_mci1rev2xx()) {

		/* at91mci MCI1 rev2xx sdio interrupt erratum */

		if (host->board->wire4 || !host->board->slot_b)

			mmc->caps |= MMC_CAP_SDIO_IRQ;

	}